From 4142dbe7f08d5dcdc0dcfd041f3f816dd6e8a7f3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 5 Jun 2022 21:42:53 +0200 Subject: [PATCH] package/uclibc: introduce and use BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS and BR2_PACKAGE_UCLIBC_SUPPORTS In this commit BR2_PACKAGE_UCLIBC_SUPPORTS looks redundant with BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS, but for other C libraries, like glibc, it can be different. To be consistent, we use the same pattern for uClibc. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/uclibc/Config.in | 28 +++++++++++++++++++++++++ toolchain/toolchain-buildroot/Config.in | 8 +------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 310414bebc..754c3ea014 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -1,3 +1,31 @@ +config BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_aarch64_be + default y if BR2_arcle + default y if BR2_arceb + default y if BR2_arm + default y if BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + default y if BR2_microblaze + 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_RISCV_64 + default y if BR2_sh4 + default y if BR2_sh4eb + default y if BR2_sparc + default y if BR2_xtensa + default y if BR2_x86_64 + +config BR2_PACKAGE_UCLIBC_SUPPORTS + bool + default y if BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS + if BR2_TOOLCHAIN_BUILDROOT_UCLIBC comment "uClibc Options" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index b68f5e3133..7ce2998cf7 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -27,13 +27,7 @@ choice config BR2_TOOLCHAIN_BUILDROOT_UCLIBC bool "uClibc-ng" - depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \ - BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_m68k || BR2_microblaze || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_RISCV_64 || \ - BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ - BR2_x86_64 + depends on BR2_PACKAGE_UCLIBC_SUPPORTS select BR2_TOOLCHAIN_USES_UCLIBC help This option selects uClibc-ng as the C library for the