build: remove check to nonexistant CONFIG_ENABLE_LOCALE variable and move DISABLE_NLS...

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39980 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 62ccbb9..8f35c32 100644 (file)
--- 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 0769a09..cc02b91 100644 (file)
--- 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 627baff..10de1f8 100644 (file)
--- 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 9fb39e1..3744f56 100644 (file)
--- 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 \
        );