Commit 1b49c92c authored Nov 13, 2014 by Thomas Petazzoni Committed by Peter Korsgaard Nov 21, 2014

uclibc: do not use GENERATE_LOCALE



Since commit 33de7401 ("Makefile:
convert "target-generatelocales" to a hook"), the GENERATE_LOCALE
variable is never defined when using uClibc. This means that setting
any value to the BR2_GENERATE_LOCALE option had no effect for uClibc
toolchains.

In this commit, we make sure the uclibc.mk logic re-creates its own
qstripped version of BR2_GENERATE_LOCALE, in a variable called
UCLIBC_GENERATE_LOCALES.

This fixes locale generation with uClibc in the internal toolchain
backend.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 404f4933

package/uclibc/uclibc.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -47,12 +47,14 @@ UCLIBC_KCONFIG_OPTS = \

		UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))

		ifeq ($(GENERATE_LOCALE),)
		UCLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE))

		ifeq ($(UCLIBC_GENERATE_LOCALES),)
		# We need at least one locale
		UCLIBC_LOCALES = en_US
		else
		# Strip out the encoding part of locale names, if any
		UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
		UCLIBC_LOCALES = $(foreach locale,$(UCLIBC_GENERATE_LOCALES),\
		$(firstword $(subst .,$(space),$(locale))))
		endif