From 6c294b83db6b46039544e70cf4932a26e92a0ec0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Mar 2016 21:02:22 +0100 Subject: [PATCH] toolchain: also source the musl package We do source the glibc and uClibc packages in the toolchain menu, because they do provide user-visible options. However, we do not so far source the musl Config.in file However, in 822be87 (toolchain: include C libraries in legal-info), a Config.in file for musl was explicitly created, so that: - legal-info would work (needed at the time, probably no longer needed nowadays), - the appropriate packages are enabled, like netbsd-queue or kernel headers. Yet, we do not source musl/Config.in, which means we do not get netbsd-queue or kernel-headers to be selected: $ make distclean; make menuconfig Toolchain ---> C library ---> musl save-and-exit $ grep BR2_PACKAGE_LINUX_HEADERS .config [nothing] $ grep BR2_PACKAGE_NETBSD_QUEUE .config [nothing] Fix that by sourcing musl/Config.in at the same place we source glibc and uClibc. Normally, we do have a check in place that verifies that a package that is not enabled is not a dependency of another package that is enabled. However, musl is only a dependency of host-gcc-final, which is a host package and has no corresponding BR2_PACKAGE_HOST_GCC_FINAL. Thus host-gcc-final is not in the PACKAGES variable, and thus does not trigger our check. Reported-by: Vicente Olivert Riera Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 37c662407f..cb4fc181dc 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -110,6 +110,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC default "musl" if BR2_TOOLCHAIN_BUILDROOT_MUSL source "package/linux-headers/Config.in" +source "package/musl/Config.in" source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/binutils/Config.in.host" -- 2.30.2