From 55fcba2a7c41d29f3f93bb37eec1264af4b45fb0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 2 Jan 2022 22:04:08 +0100 Subject: [PATCH] toolchain: remove binutils bug 21464 Binutils bug 21464 is not present anymore in Buildroot so let's remove it and its depends on in libgeos and postgis packages. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libgeos/Config.in | 4 +--- package/postgis/Config.in | 4 +--- toolchain/Config.in | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 5e861ab010..8411627d43 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - 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 @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - 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 f4d913ece7..405c5c723a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, 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 @@ -19,8 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597" +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 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..fd005f4740 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 -# Affect toolchains built with binutils 2.31.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 - bool - default y if BR2_or1k - # https://sourceware.org/bugzilla/show_bug.cgi?id=27597 # Affect toolchains built with binutils 2.36.1, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597