From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Mar 2014 15:54:07 +0000 (+0000)
Subject: build: remove check to nonexistant CONFIG_ENABLE_LOCALE variable and move DISABLE_NLS... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=51ae801ee3ba4b97e3e13e2a0ac95fe8b292898f;p=openwrt%2Fstaging%2Fadrian.git

build: remove check to nonexistant CONFIG_ENABLE_LOCALE variable and move DISABLE_NLS to package-defaults.mk

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39980
---

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 62ccbb93ef..8f35c3293e 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -64,6 +64,7 @@ ifneq ($(strip $(PKG_UNPACK)),)
 endif
 
 EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
+DISABLE_NLS:=--disable-nls
 
 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \
diff --git a/rules.mk b/rules.mk
index 0769a09278..cc02b91bc9 100644
--- a/rules.mk
+++ b/rules.mk
@@ -260,12 +260,6 @@ else
     $(SCRIPT_DIR)/rstrip.sh
 endif
 
-ifeq ($(CONFIG_ENABLE_LOCALE),true)
-  DISABLE_NLS:=--enable-nls
-else
-  DISABLE_NLS:=--disable-nls
-endif
-
 ifeq ($(CONFIG_IPV6),y)
   DISABLE_IPV6:=
 else
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 627baff528..10de1f883f 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -29,7 +29,6 @@ define Host/Configure
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--disable-werror \
-		$(DISABLE_NLS) \
 		--without-uiout \
 		--disable-tui --disable-gdbtk --without-x \
 		--without-included-gettext \
diff --git a/toolchain/insight/Makefile b/toolchain/insight/Makefile
index 9fb39e1932..3744f56451 100644
--- a/toolchain/insight/Makefile
+++ b/toolchain/insight/Makefile
@@ -28,7 +28,6 @@ define Host/Configure
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
-		$(DISABLE_NLS) \
 		--enable-threads \
 		--enable-werror=no \
 	);