From d41ff469b5a9bdf136ba72dc631ee7a4ffab0b9a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 Oct 2023 22:14:49 +0200 Subject: [PATCH] package/libgeos: needs gcc >= 4.9 libgeos needs gcc >= 4.9 since bump to version 3.12.0 in commit 16727d4595dd1972a46e92bbd2260a896cc19b60 and https://github.com/libgeos/geos/commit/289ed4efb26a9944f4385381e1574184b1e7448e: In file included from /home/thomas/autobuild/instance-0/output-1/build/libgeos-3.12.0/src/algorithm/ConvexHull.cpp:30:0: /home/thomas/autobuild/instance-0/output-1/build/libgeos-3.12.0/include/geos/util.h:38:12: error: 'std::make_unique' has not been declared using std::make_unique; ^ This dependency is propagated to libgeos only reverse dependency, postgis. Fixes: - http://autobuild.buildroot.org/results/56bb572fb1d56d45dbb950a73b9b888239fa6968 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit f0d4bf1df5838c3aba678ca21d6ce2214f0466e0) Signed-off-by: Peter Korsgaard --- package/libgeos/Config.in | 4 +++- package/postgis/Config.in | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 8411627d43..2a27c6f2a4 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the @@ -13,7 +14,8 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 405c5c723a..7d42390677 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_POSTGIS bool "postgis" depends on BR2_PACKAGE_POSTGRESQL_FULL depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos @@ -18,7 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597