gdal:unify build rule - all deps now x86_64 enabled

This commit is contained in:
Tony Theodore 2015-09-11 14:41:09 +10:00
parent 2435d7b58f
commit 8afc49f77d
1 changed files with 3 additions and 17 deletions

View File

@ -19,7 +19,7 @@ define $(PKG)_UPDATE
head -1
endef
define $(PKG)_CONFIGURE
define $(PKG)_BUILD
cd '$(1)' && autoreconf -fi
# The option '--without-threads' means native win32 threading without pthread.
cd '$(1)' && ./configure \
@ -73,10 +73,9 @@ define $(PKG)_CONFIGURE
--without-perl \
--without-php \
--without-ruby \
--without-python
endef
--without-python \
LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
define $(PKG)_MAKE
$(MAKE) -C '$(1)' -j '$(JOBS)' lib-target
$(MAKE) -C '$(1)' -j '$(JOBS)' install-lib
$(MAKE) -C '$(1)/port' -j '$(JOBS)' install
@ -87,16 +86,3 @@ define $(PKG)_MAKE
$(MAKE) -C '$(1)/apps' -j '$(JOBS)' install
ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
endef
define $(PKG)_BUILD_x86_64-w64-mingw32
$($(PKG)_CONFIGURE) \
LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$($(PKG)_MAKE)
endef
define $(PKG)_BUILD_i686-w64-mingw32
$($(PKG)_CONFIGURE) \
--with-netcdf='$(PREFIX)/$(TARGET)' \
LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$($(PKG)_MAKE)
endef