From bd0ffe2206fbd32baf7f4a1dc5fde81cfad70462 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 13 Nov 2014 23:17:25 +0100 Subject: [PATCH] toolchain: do not allow BR2_GENERATE_LOCALE with musl Generating locales is possible in two situations: - With the internal toolchain backend, when the uClibc library is used. With uClibc, locales are generated at build time of the C library, so with uClibc it's only possible with the internal toolchain backend. - With either the internal or external toolchain backend when the glibc library is used. With glibc, locales can be generated afterwards, using the host-localedef utility. Until we had the musl C library supported in the internal toolchain backend, the condition: BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_USES_GLIBC was correct to capture the above two situations. Now that we have musl support in the internal toolchain backend, then BR2_TOOLCHAIN_BUILDROOT is incorrect, and we should use BR2_TOOLCHAIN_BUILDROOT_UCLIBC instead. Basic locale support in musl has appeared in musl 1.1.4, but we are not yet capable of generating the locale files for musl. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/toolchain-common.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 2dfaeccbc..683c143c2 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -69,7 +69,7 @@ config BR2_GENERATE_LOCALE string "Generate locale data" default "" depends on \ - BR2_TOOLCHAIN_BUILDROOT || \ + BR2_TOOLCHAIN_BUILDROOT_UCLIBC || \ BR2_TOOLCHAIN_USES_GLIBC help Generate support for a list of locales. Locales can be