diff options
| -rw-r--r-- | packages/gdal/files/gdal_config.patch | 61 | ||||
| -rw-r--r-- | packages/gdal/gdal_1.5.2.bb | 18 |
2 files changed, 74 insertions, 5 deletions
diff --git a/packages/gdal/files/gdal_config.patch b/packages/gdal/files/gdal_config.patch new file mode 100644 index 0000000000..b09cc43faf --- /dev/null +++ b/packages/gdal/files/gdal_config.patch @@ -0,0 +1,61 @@ +Index: gdal-1.5.2/apps/GNUmakefile +=================================================================== +--- gdal-1.5.2.orig/apps/GNUmakefile 2007-12-21 04:20:10.000000000 +0100 ++++ gdal-1.5.2/apps/GNUmakefile 2008-11-09 20:58:31.506906134 +0100 +@@ -21,7 +21,7 @@ + ogrtindex$(EXE) + endif + +-default: gdal-config-inst gdal-config $(BIN_LIST) ++default: gdal-config $(BIN_LIST) + + lib-depend: + (cd ../gcore ; $(MAKE) ) +@@ -108,41 +108,26 @@ + -o test_ogrsf$(EXE) + + clean: +- $(RM) *.o $(BIN_LIST) core gdal-config gdal-config-inst ++ $(RM) *.o $(BIN_LIST) core gdal-config + + $(DEP_LIBS): + +- + gdal-config: gdal-config.in ../GDALmake.opt ./GNUmakefile ../VERSION + rm -f gdal-config + echo '#!/bin/sh' > gdal-config +- echo 'CONFIG_LIBS="$(CONFIG_LIBS)"' >> gdal-config ++ echo 'CONFIG_LIBS="$(CONFIG_LIBS_INS)"' >> gdal-config + echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config +- echo 'CONFIG_PREFIX="$(GDAL_ROOT)"' >> gdal-config +- echo 'CONFIG_CFLAGS="-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/alg -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts"' >> gdal-config +- echo 'CONFIG_DATA="$(GDAL_ROOT)/data"' >> gdal-config ++ echo 'CONFIG_PREFIX="$(INST_PREFIX)"' >> gdal-config ++ echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)"' >> gdal-config ++ echo 'CONFIG_DATA="$(INST_DATA)"' >> gdal-config + echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config + echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config + echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config + cat gdal-config.in >> gdal-config + chmod a+x gdal-config + +-gdal-config-inst: gdal-config.in ../GDALmake.opt ./GNUmakefile ../VERSION +- rm -f gdal-config-inst +- echo '#!/bin/sh' > gdal-config-inst +- echo 'CONFIG_LIBS="$(CONFIG_LIBS_INS)"' >> gdal-config-inst +- echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config-inst +- echo 'CONFIG_PREFIX="$(INST_PREFIX)"' >> gdal-config-inst +- echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)"' >> gdal-config-inst +- echo 'CONFIG_DATA="$(INST_DATA)"' >> gdal-config-inst +- echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config-inst +- echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config-inst +- echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config-inst +- cat gdal-config.in >> gdal-config-inst +- chmod a+x gdal-config-inst +- + + install: default + for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done +- $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config ++ $(INSTALL) gdal-config $(DESTDIR)$(INST_BIN)/ + diff --git a/packages/gdal/gdal_1.5.2.bb b/packages/gdal/gdal_1.5.2.bb index 60162e15f5..6874ddf35a 100644 --- a/packages/gdal/gdal_1.5.2.bb +++ b/packages/gdal/gdal_1.5.2.bb @@ -1,11 +1,14 @@ DESCRIPTION = "GDAL is a translator library for raster geospatial data formats" HOMEPAGE = "http://www.gdal.org/" LICENSE = "MIT" -DEPENDS = "proj-4 sqlite3 zlib jpeg libpng jasper expat" +DEPENDS = "proj-4 sqlite3 zlib jpeg libpng tiff giflib curl jasper expat" +PR = "r1" -SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz" +SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz \ + file://gdal_config.patch;patch=1 \ + " -inherit autotools pkgconfig binconfig +inherit autotools binconfig EXTRA_OECONF = "--without-perl \ --without-python \ @@ -14,15 +17,20 @@ EXTRA_OECONF = "--without-perl \ --with-libz=${STAGING_DIR_TARGET} \ --with-png=${STAGING_DIR_TARGET} \ --with-jpeg=${STAGING_DIR_TARGET} \ - --with-jasper=${STAGING_DIR_TARGET} \ --with-libtiff=${STAGING_DIR_TARGET} \ + --with-gif=${STAGING_DIR_TARGET} \ + --with-jasper=${STAGING_DIR_TARGET} \ --with-expat=${STAGING_DIR_TARGET} \ --with-expat-inc=${STAGING_INCDIR} \ --with-expat-lib=${STAGING_LIBDIR} \ " # GDAL clutter /usr/share with files instead of using a subdir :( -FILES_${PN} += "${datadir}" +FILES_${PN}-dev += "${datadir}" + +do_compile() { + oe_runmake default +} do_stage() { autotools_stage_all |