mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gdal: fix json dependency

Browse Source 
gdal needs json-c, not libjson, resulting in the following build failure
since the addition of the package in commit
1e64fa2956:

configure: error: could not find json-c/json.h

While at it, also drop unrecognized options:

configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --disable-nls, --without-dods-root, --without-fme, --without-grass, --without-libgrass, --without-ingres, --without-jasper, --without-charls, --without-mdb, --without-mongocxx, --without-mrsid_lidar, --without-perl

Fixes:
 - http://autobuild.buildroot.org/results/f977675125167806e844a176a4c8c8873557b709

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2022-07-28 10:00:16 +02:00
committed by Thomas Petazzoni
parent 117c21820f
commit 622e5f67bd
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/gdal/Config.in
View File

@@ -1,6 +1,7 @@
config BR2_PACKAGE_GDAL config BR2_PACKAGE_GDAL
bool "gdal" bool "gdal"
depends on BR2_INSTALL_LIBSTDCPP # proj, libjson depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
depends on BR2_INSTALL_LIBSTDCPP # proj
# configure can't find proj, when linking statically # configure can't find proj, when linking statically
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
@@ -8,8 +9,8 @@ config BR2_PACKAGE_GDAL
depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_TOOLCHAIN_HAS_THREADS # proj
depends on BR2_USE_WCHAR # proj depends on BR2_USE_WCHAR # proj
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBGEOTIFF select BR2_PACKAGE_LIBGEOTIFF
select BR2_PACKAGE_LIBJSON
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_PROJ select BR2_PACKAGE_PROJ
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
@@ -24,6 +25,7 @@ config BR2_PACKAGE_GDAL
https://gdal.org/ https://gdal.org/
comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \

15
package/gdal/gdal.mk
View File

@@ -18,14 +18,14 @@ GDAL_CONFIG_SCRIPTS = gdal-config
# enabled but it seems, in contrast to mrf driver support, that they # enabled but it seems, in contrast to mrf driver support, that they
# can be implicitly disabled, by configuring gdal without their # can be implicitly disabled, by configuring gdal without their
# respectively needed dependencies. # respectively needed dependencies.
GDAL_DEPENDENCIES = host-pkgconf jpeg libgeotiff libpng proj tiff zlib GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib
# Yes, even though they have --with options, these few libraries are # Yes, even though they have --with options, these few libraries are
# mandatory. If we don't provide them, bundled versions are used. # mandatory. If we don't provide them, bundled versions are used.
GDAL_CONF_OPTS = \ GDAL_CONF_OPTS = \
--with-geotiff \ --with-geotiff \
--with-jpeg \ --with-jpeg \
--with-libjson-c \ --with-libjson-c=$(STAGING_DIR)/usr \
--with-libtool \ --with-libtool \
--with-libz \ --with-libz \
--with-png \ --with-png \
@@ -38,45 +38,35 @@ GDAL_CONF_OPTS = \
--without-cryptopp \ --without-cryptopp \
--without-curl \ --without-curl \
--without-dds \ --without-dds \
--without-dods-root \
--without-ecw \ --without-ecw \
--without-expat \ --without-expat \
--without-exr \ --without-exr \
--without-fgdb \ --without-fgdb \
--without-fme \
--without-freexl \ --without-freexl \
--without-geos \ --without-geos \
--without-gnm \ --without-gnm \
--without-libkml \ --without-libkml \
--without-lz4 \ --without-lz4 \
--without-grass \
--without-libgrass \
--without-gta \ --without-gta \
--without-hdf4 \ --without-hdf4 \
--without-hdf5 \ --without-hdf5 \
--without-hdfs \ --without-hdfs \
--without-heif \ --without-heif \
--without-idb \ --without-idb \
--without-ingres \
--without-jp2lura \ --without-jp2lura \
--without-jasper \
--without-java \ --without-java \
--without-jpeg12 \ --without-jpeg12 \
--without-jxl \ --without-jxl \
--without-charls \
--without-kakadu \ --without-kakadu \
--without-kea \ --without-kea \
--without-lerc \ --without-lerc \
--without-gif \ --without-gif \
--without-liblzma \ --without-liblzma \
--without-libdeflate \ --without-libdeflate \
--without-mdb \
--without-mongocxx \
--without-mongocxxv3 \ --without-mongocxxv3 \
--without-mrsid \ --without-mrsid \
--without-jp2mrsid \ --without-jp2mrsid \
--without-macosx-framework \ --without-macosx-framework \
--without-mrsid_lidar \
--without-msg \ --without-msg \
--without-mysql \ --without-mysql \
--without-netcdf \ --without-netcdf \
@@ -92,7 +82,6 @@ GDAL_CONF_OPTS = \
--without-pcre \ --without-pcre \
--without-pcre2 \ --without-pcre2 \
--without-pdfium \ --without-pdfium \
--without-perl \
--without-podofo \ --without-podofo \
--without-poppler \ --without-poppler \
--without-python \ --without-python \