From a8be4a04ade8e695c5c4d4a825253d69e80693f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 23:09:22 +0200 Subject: [PATCH] support/config-fragments: replace br-i386-pentium-mmx-musl Replace br-i386-pentium-mmx-musl by bootlin-x86-i686-musl to avoid the following build failure with efivar and musl < 1.2.3 as suggested in https://patchwork.ozlabs.org/project/buildroot/patch/20240303171115.1140763-1-ju.o@free.fr: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: ./libefisec.so: undefined reference to `qsort_r' Fixes: - http://autobuild.buildroot.org/results/a0ed3970da8a84d884b26c081b49b8d2b7208829 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../autobuild/bootlin-x86-i686-musl.config | 4 ++++ .../autobuild/br-i386-pentium-mmx-musl.config | 10 ---------- .../config-fragments/autobuild/toolchain-configs.csv | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 support/config-fragments/autobuild/bootlin-x86-i686-musl.config delete mode 100644 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config diff --git a/support/config-fragments/autobuild/bootlin-x86-i686-musl.config b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config new file mode 100644 index 0000000000..2afe096f32 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config @@ -0,0 +1,4 @@ +BR2_i386=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE=y diff --git a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config deleted file mode 100644 index 1b3c45fe9b..0000000000 --- a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_x86_pentium_mmx=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.11.2.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 47d5fddfbd..654f11e28b 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -39,6 +39,7 @@ support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-i686-musl.config,x86_64 support/config-fragments/autobuild/bootlin-x86-64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-x86-64-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-xtensa-uclibc.config,x86_64 @@ -50,7 +51,6 @@ support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 -support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 support/config-fragments/autobuild/br-microblazeel-full-internal.config,any support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64 support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64