Revert "toolchain: remove binutils bug 21464"

This reverts commit 06879a25e2. This
needs other commits to be applied first.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2021-07-26 23:55:18 +02:00
parent 06879a25e2
commit af58830d07
4 changed files with 13 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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