From 4350d485a441b31ebb1ccb5124f081fda9104132 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 20:45:20 +0100 Subject: [PATCH] package/gdal: deflate64 needs libzlib deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db9..247e13663c 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON