diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-02-15 14:52:04 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-02-15 14:52:04 (GMT) |
| commit | d9fefb83b7f7f275f4903fbb8fb5372a14175ef7 (patch) | |
| tree | 2098d3a70f2af0cf2f82138554332be293c83b5b /src | |
| parent | 48d206d2c6f554e1ab34c5f0617a054eb50cd723 (diff) | |
| download | mxe-d9fefb83b7f7f275f4903fbb8fb5372a14175ef7.zip mxe-d9fefb83b7f7f275f4903fbb8fb5372a14175ef7.tar.gz mxe-d9fefb83b7f7f275f4903fbb8fb5372a14175ef7.tar.bz2 | |
make all dependencies explicit in package gdal
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdal-fix-pg.patch | 15 | ||||
| -rw-r--r-- | src/gdal.mk | 49 |
2 files changed, 60 insertions, 4 deletions
diff --git a/src/gdal-fix-pg.patch b/src/gdal-fix-pg.patch new file mode 100644 index 0000000..b5256a3 --- /dev/null +++ b/src/gdal-fix-pg.patch @@ -0,0 +1,15 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru gdal-1.7.1.orig/configure.in gdal-1.7.1/configure.in +--- gdal-1.7.1.orig/configure.in 2010-02-08 20:52:34.000000000 +0100 ++++ gdal-1.7.1/configure.in 2010-02-15 15:39:39.000000000 +0100 +@@ -418,7 +418,7 @@ + AC_MSG_RESULT([yes]) + + ax_save_LIBS="${LIBS}" +- LIBS=-L`$PG_CONFIG --libdir`" -lpq" ++ LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS" + AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,) + LIBS="${ax_save_LIBS}" + diff --git a/src/gdal.mk b/src/gdal.mk index edd888f..77aff85 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -11,7 +11,7 @@ $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gdal.org/ $(PKG)_URL := http://ftp.remotesensing.org/gdal/$($(PKG)_FILE) $(PKG)_URL_2 := http://download.osgeo.org/gdal/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libpng tiff libgeotiff jpeg giflib expat curl geos +$(PKG)_DEPS := gcc zlib libpng tiff libgeotiff jpeg jasper giflib expat sqlite curl geos postgresql libodbc++ define $(PKG)_UPDATE wget -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ @@ -20,23 +20,64 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && autoconf + # The option '--without-threads' means native win32 threading without pthread. cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - LIBS='-ljpeg' \ - --with-threads \ + --with-bsb \ + --with-grib \ + --with-ogr \ + --with-vfk \ + --with-pam \ + --without-threads \ --with-libz='$(PREFIX)/$(TARGET)' \ --with-png='$(PREFIX)/$(TARGET)' \ --with-libtiff='$(PREFIX)/$(TARGET)' \ --with-geotiff='$(PREFIX)/$(TARGET)' \ --with-jpeg='$(PREFIX)/$(TARGET)' \ + --with-jasper='$(PREFIX)/$(TARGET)' \ --with-gif='$(PREFIX)/$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ + --with-sqlite3='$(PREFIX)/$(TARGET)' \ --with-curl='$(PREFIX)/$(TARGET)/bin/curl-config' \ --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \ + --with-pg='$(PREFIX)/$(TARGET)/bin/pg_config' \ + --with-odbc='$(PREFIX)/$(TARGET)' \ + --without-static-proj4 \ + --without-xerces \ + --without-grass \ + --without-libgrass \ + --without-spatialite \ + --without-cfitsio \ + --without-pcraster \ + --without-netcdf \ + --without-pcidsk \ + --without-ogdi \ + --without-fme \ + --without-hdf4 \ + --without-hdf5 \ + --without-ecw \ + --without-kakadu \ + --without-mrsid \ + --without-jp2mrsid \ + --without-msg \ + --without-oci \ + --without-mysql \ + --without-ingres \ + --without-dods-root \ + --without-dwgdirect \ + --without-dwg-plt \ + --without-idb \ + --without-sde \ + --without-epsilon \ + --without-perl \ + --without-php \ + --without-ruby \ --without-python \ - --without-ngpython + --without-macosx-framework \ + LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install |