NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gdal: deflate64 needs libzlib

Browse Source 
deflate64 unconditionally uses FAR since its addition with
d6baebcc73
resulting in the following build failure with zlib-ng since bump to
version 3.8.2 in commit d2e349301b:

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: d2e349301b
 - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2024-02-16 20:45:20 +01:00 committed by Peter Korsgaard
parent d8982b02b6
commit 4350d485a4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/gdal/gdal.mk
View File

@ -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