fix all gdal shared library related requirements

This commit is contained in:
Hamza Alloush 2015-05-27 11:46:33 +03:00 committed by Saikrishna Arcot
parent d9128035d6
commit ee7022d5aa
No known key found for this signature in database
GPG Key ID: 203B47C2C66B784B
3 changed files with 26 additions and 31 deletions

View File

@ -23,17 +23,12 @@ define $(PKG)_CONFIGURE
cd '$(1)' && autoreconf -fi
# The option '--without-threads' means native win32 threading without pthread.
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build='$(BUILD)' \
--enable-static \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
$(MXE_CONFIGURE_OPTS) \
--with-bsb \
--with-grib \
--with-ogr \
--with-pam \
--without-threads \
--with-static-proj4 \
--with-libz='$(PREFIX)/$(TARGET)' \
--with-png='$(PREFIX)/$(TARGET)' \
--with-libtiff='$(PREFIX)/$(TARGET)' \
@ -83,8 +78,8 @@ define $(PKG)_MAKE
$(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install
$(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install
$(MAKE) -C '$(1)/alg' -j '$(JOBS)' install
$(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED=
$(MAKE) -C '$(1)/apps' -j '$(JOBS)' install BIN_LIST=
$(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install #OGR_ENABLED=
$(MAKE) -C '$(1)/apps' -j '$(JOBS)' install
ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
endef
@ -103,5 +98,3 @@ endef
# Can't use $(PKG)_BUILD_SHARED here as $(PKG)_BUILD_i686-w64-mingw32 has a
# higher precedence.
$(PKG)_BUILD_i686-w64-mingw32.shared =
$(PKG)_BUILD_x86_64-w64-mingw32.shared =

View File

@ -21,19 +21,25 @@ define $(PKG)_BUILD
cd '$(1)' && $(LIBTOOLIZE) --force
cd '$(1)' && autoreconf --install
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
$(MXE_CONFIGURE_OPTS) \
--disable-fortran \
--disable-netcdf \
--prefix='$(PREFIX)/$(TARGET)' \
CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1"
$(MAKE) -C '$(1)'/hdf/src -j '$(JOBS)'
$(if $(BUILD_STATIC), \
CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1") \
AR='$(TARGET)-ar' \
$(if $(BUILD_SHARED), \
LIBS="-lportablexdr -lws2_32" CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_DYNAMIC_LIB=1 -DBIG_LONGS")
$(MAKE) -C '$(1)'/mfhdf/xdr -j '$(JOBS)' \
LDFLAGS=-no-undefined
$(MAKE) -C '$(1)'/hdf/src -j '$(JOBS)' \
LDFLAGS=-no-undefined
$(MAKE) -C '$(1)'/hdf/src -j 1 install
$(MAKE) -C '$(1)'/mfhdf/libsrc -j '$(JOBS)'
$(MAKE) -C '$(1)'/mfhdf/libsrc -j '$(JOBS)' \
LDFLAGS="-no-undefined -ldf"
$(MAKE) -C '$(1)'/mfhdf/libsrc -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_SHARED =

View File

@ -26,20 +26,16 @@ define $(PKG)_BUILD
cd '$(1)' && \
$(SED) -i -e 's/#ifdef IGNORE/#if 0/' libsrc4/nc4hdf.c libsrc4/ncfunc.c libsrc/attr.c ncgen/cvt.c && \
./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
$(MXE_CONFIGURE_OPTS) \
--enable-netcdf-4 \
--enable-hdf4 \
--prefix='$(PREFIX)/$(TARGET)' \
CPPFLAGS="-D_DLGS_H" \
--disable-testsets \
--disable-examples \
CPPFLAGS="-D_DLGS_H -DWIN32_LEAN_AND_MEAN" \
LIBS="-lmfhdf -ldf -lportablexdr -lws2_32"
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j '$(JOBS)' \
LDFLAGS=-no-undefined
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 = $(subst --enable-hdf4, --disable-hdf4,\
$(subst -lmfhdf -ldf,,$($(PKG)_BUILD)))
$(PKG)_BUILD_SHARED =