* [Buildroot] [git commit] Revert "toolchain: remove binutils bug 21464"
@ 2021-07-26 21:55 Thomas Petazzoni
0 siblings, 0 replies; only message in thread
From: Thomas Petazzoni @ 2021-07-26 21:55 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=af58830d0736cf60d0bb65b562c6888f633318d0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This reverts commit 06879a25e287a4b4cdc0e721a62d3bfb182933b5. This
needs other commits to be applied first.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/libgeos/Config.in | 4 +++-
package/postgis/Config.in | 4 +++-
package/protobuf/Config.in | 1 +
toolchain/Config.in | 6 ++++++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in
index 124e2da661..86a1cddcf3 100644
--- a/package/libgeos/Config.in
+++ b/package/libgeos/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGEOS
bool "libgeos"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
+ 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
@@ -12,6 +13,7 @@ config BR2_PACKAGE_LIBGEOS
https://trac.osgeo.org/geos
-comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 27597"
+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 78c52ea7b2..04705f7e16 100644
--- a/package/postgis/Config.in
+++ b/package/postgis/Config.in
@@ -6,6 +6,7 @@ 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
@@ -19,8 +20,9 @@ config BR2_PACKAGE_POSTGIS
https://postgis.net/
-comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597"
+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_BINUTILS_BUG_21464 || \
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in
index 46c820b9cf..30050950aa 100644
--- a/package/protobuf/Config.in
+++ b/package/protobuf/Config.in
@@ -24,6 +24,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
default y if BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
depends on BR2_USE_MMU # fork()
+ depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
config BR2_PACKAGE_PROTOBUF
bool "protobuf"
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 255832edc9..03375e0c52 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -71,6 +71,12 @@ 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
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-26 21:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26 21:55 [Buildroot] [git commit] Revert "toolchain: remove binutils bug 21464" Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.