we use BR2_ENABLE_LOCALE not ENABLE_LOCALE

diff --git a/package/Makefile.in b/package/Makefile.in
index 51086888dfbbc8fd4c57e239562533334c9d0115..f541d7ca8cb1477b7f7b582fb908dede980ad7c6 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -85,7 +85,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
                STRIP=$(TARGET_CROSS)strip \
                OBJCOPY=$(TARGET_CROSS)objcopy
 
-ifeq ($(ENABLE_LOCALE),true)
+ifeq ($(BR2_ENABLE_LOCALE),y)
 DISABLE_NLS:=
 else
 DISABLE_NLS:=--disable-nls

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 6b8a0df6f84e172107661565427fa2f98f57e7bc..e75a236426718ea31385c98c38fdd67605489181 100644 (file)
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -83,7 +83,7 @@ $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
                --disable-sim --enable-gdbserver \
                --without-included-gettext \
        );
-ifeq ($(ENABLE_LOCALE),true)
+ifeq ($(BR2_ENABLE_LOCALE),y)
        -$(SED) "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
 endif
        touch  $(GDB_TARGET_DIR)/.configured

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index fbc6cd7702d4ec3f7b281d1cb97266a7cba18694..f2933d4538ce52b651d166b46a921d370c4b4192 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -66,9 +66,6 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 uclibc-configured: dependencies kernel-headers $(UCLIBC_DIR)/.configured
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
        cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
-ifeq ($(ENABLE_LOCALE),true)
-       $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.config
-endif
        $(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
                -e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
                -e 's,^TARGET_ARCH="none",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
@@ -116,6 +113,11 @@ ifeq ($(BR2_PTHREADS_OLD),y)
 endif
 ifeq ($(BR2_PTHREADS_NATIVE),y)
        $(SED) 's,# UCLIBC_HAS_THREADS_NATIVE is not set,UCLIBC_HAS_THREADS_NATIVE=y,g' $(UCLIBC_DIR)/.config
+endif
+ifeq ($(BR2_ENABLE_LOCALE),y)
+       $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.config
+else
+       $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.config
 endif
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib