From 290615edc12f5cddcbeec212533f111f5fdef848 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 17 Oct 2006 16:57:02 +0000
Subject: we use BR2_ENABLE_LOCALE not ENABLE_LOCALE

---
 package/Makefile.in        | 2 +-
 toolchain/gdb/gdb.mk       | 2 +-
 toolchain/uClibc/uclibc.mk | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 51086888d..f541d7ca8 100644
--- 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 6b8a0df6f..e75a23642 100644
--- 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 fbc6cd770..f2933d453 100644
--- 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
-- 
cgit v1.2.3