From ee51fd0efef5287a8119a78d16503c42e4436877 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 27 Jul 2022 13:00:45 +0200 Subject: [PATCH] package/postgis: drop optional dependency on gdal The BR2_PACKAGE_LIBGDAL option does not exist, so drop this dead code, and unconditionally disable GDAL support. Signed-off-by: Thomas Petazzoni (cherry picked from commit d48af707737ece6242d58e83b98e5c601fa55acc) Signed-off-by: Peter Korsgaard --- package/postgis/postgis.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index b77071d03b..652e7951ae 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -19,14 +19,8 @@ POSTGIS_DEPENDENCIES = postgresql libgeos proj libxml2 POSTGIS_CONF_OPTS += \ --with-pgconfig=$(STAGING_DIR)/usr/bin/pg_config \ --with-geosconfig=$(STAGING_DIR)/usr/bin/geos-config \ - --with-xml2config=$(STAGING_DIR)/usr/bin/xml2-config - -ifeq ($(BR2_PACKAGE_LIBGDAL),y) -POSTGIS_DEPENDENCIES += libgdal -POSTGIS_CONF_OPTS += --with-raster -else -POSTGIS_CONF_OPTS += --without-raster -endif + --with-xml2config=$(STAGING_DIR)/usr/bin/xml2-config \ + --without-raster ifeq ($(BR2_PACKAGE_JSON_C),y) POSTGIS_DEPENDENCIES += json-c