From fd839aeb7f40596e60bc53a96b7a65892924cc26 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 5 Jun 2022 21:42:54 +0200 Subject: [PATCH] package/glibc: introduce and use BR2_PACKAGE_GLIBC_ARCH_SUPPORTS and BR2_PACKAGE_GLIBC_SUPPORTS As part of this, the dependency of the comment "glibc needs a toolchain w/ dynamic library, kernel headers >= 3.2" is changed to use BR2_PACKAGE_GLIBC_ARCH_SUPPORTS instead of just BR2_USE_MMU, so that the comment only appears on architectures for which glibc is supported Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/glibc/Config.in | 38 +++++++++++++++++++++++++ toolchain/toolchain-buildroot/Config.in | 20 ++----------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 8e9ddac7d9..56f7299568 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -1,3 +1,41 @@ +config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_armeb + default y if BR2_aarch64 + default y if BR2_aarch64_be + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_or1k + default y if BR2_powerpc + default y if BR2_powerpc64 + default y if BR2_powerpc_power8 + default y if BR2_riscv + default y if BR2_s390x + default y if BR2_sh + default y if BR2_sparc64 + default y if BR2_x86_64 + default y if BR2_microblaze + default y if BR2_nios2 + default y if BR2_arc && BR2_ARC_ATOMIC_EXT + default y if BR2_csky + depends on !BR2_powerpc_SPE + depends on BR2_RISCV_ISA_RVA || !BR2_riscv + depends on BR2_USE_MMU + +config BR2_PACKAGE_GLIBC_SUPPORTS + bool + default y if BR2_PACKAGE_GLIBC_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc + if BR2_TOOLCHAIN_BUILDROOT_GLIBC comment "Glibc Options" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 559c254622..b68f5e3133 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -43,23 +43,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC config BR2_TOOLCHAIN_BUILDROOT_GLIBC bool "glibc" - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_aarch64_be || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ - BR2_powerpc || BR2_powerpc64 || BR2_powerpc_power8 || \ - BR2_riscv || BR2_s390x || BR2_sh || \ - BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ - BR2_csky || BR2_or1k - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc - depends on !BR2_powerpc_SPE - depends on BR2_RISCV_ISA_RVA || !BR2_riscv + depends on BR2_PACKAGE_GLIBC_SUPPORTS select BR2_TOOLCHAIN_USES_GLIBC help This option selects glibc as the C library for the @@ -68,7 +52,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC http://www.gnu.org/software/libc/ comment "glibc needs a toolchain w/ dynamic library, kernel headers >= 3.2" - depends on BR2_USE_MMU + depends on BR2_PACKAGE_GLIBC_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 # glibc >= 2.26 require kernel headers >= 3.10 on powerpc64le.