package/libgeos: use specific bug instead of BR2_nios2 to disable package

Let's use the _BUG_ form for disabling this package instead of BR2_nios2
architecture as we already use it for other packages.

Propagate this dependency to postgis. Also add the missing dependency on
bug 21464 to postgis.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Arnout:
 - put 27597 after 21464 instead of before it;
 - propagate dependency to postgis;
 - mention the bugs in the comments.
]

diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in
index bbcafe7740748d63cbb28968943378159c9be9ca..ebe40bd1ff05652c732441224a7c276734378cef 100644 (file)
--- a/package/libgeos/Config.in
+++ b/package/libgeos/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBGEOS
        bool "libgeos"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
-       depends on !BR2_nios2
        depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
+       depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
        help
          GEOS (Geometry Engine - Open Source) is a C++ port of the
          JTS Topology Suite (JTS). It aims to contain the complete
@@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBGEOS
 
          https://trac.osgeo.org/geos
 
-comment "libgeos needs a toolchain w/ C++, wchar"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
-       depends on !BR2_nios2 || !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
+comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 21464, 27597"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+                  !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \
+                  !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597

diff --git a/package/postgis/Config.in b/package/postgis/Config.in
index d73ece17a6397eff63b1a20a5b9e91329b33e2de..830d75b76225b0d64ae9739d7a4ba1c21bfe0e6e 100644 (file)
--- a/package/postgis/Config.in
+++ b/package/postgis/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_POSTGIS
        depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
        depends on BR2_TOOLCHAIN_HAS_THREADS # proj
        depends on BR2_USE_WCHAR # libgeos, proj
+       depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos
+       depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos
        select BR2_PACKAGE_LIBGEOS
        select BR2_PACKAGE_PROJ
        select BR2_PACKAGE_LIBXML2
@@ -18,7 +20,9 @@ config BR2_PACKAGE_POSTGIS
 
          https://postgis.net/
 
-comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7"
+comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597"
        depends on !BR2_microblazeel && !BR2_microblazebe # ICE
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
-               !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+               !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR \
+               !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \
+               !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597