diff options
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 6 | ||||
| -rw-r--r-- | package/eglibc/Makefile | 3 | ||||
| -rw-r--r-- | package/glibc/Makefile | 3 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 6 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile.inc | 2 |
7 files changed, 2 insertions, 21 deletions
diff --git a/mk/build.mk b/mk/build.mk index b597dbc61..f784c99db 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -12,7 +12,6 @@ CONFIG_CONFIG_IN = Config.in CONFIG = config DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_LOCALES=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_LEAVE_ETC_ALONE=n \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index d6ac45cc2..f0af93810 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -87,7 +87,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --enable-static \ --disable-dependency-tracking \ --disable-libtool-lock \ - $(NLS) \ + --disable-nls \ ${CONFIGURE_ARGS} $(MAKE_TRACE) else @echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2 diff --git a/mk/vars.mk b/mk/vars.mk index e84e8b86b..8e147b23d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -242,10 +242,4 @@ ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe endif -ifeq ($(ADK_LOCALES),y) -NLS:= --enable-nls -else -NLS:= --disable-nls -endif - include $(TOPDIR)/mk/mirrors.mk diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 98c6b2de9..c93fbbefe 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -31,9 +31,6 @@ do-install: $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \ done $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin -ifeq ($(ADK_LOCALES),y) - $(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_EGLIBC)/usr/bin -endif ${INSTALL_DIR} $(IDIR_EGLIBC)/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc ${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_EGLIBC}/etc diff --git a/package/glibc/Makefile b/package/glibc/Makefile index f7aabf15f..af70e125f 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -38,9 +38,6 @@ do-install: done ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin -ifeq ($(ADK_LOCALES),y) - $(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin -endif ${INSTALL_DIR} ${IDIR_GLIBC}/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc ${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index ea139b7ec..1dea618ef 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -12,12 +12,6 @@ config ADK_HOST help Configure host for IPKG package management. -config ADK_LOCALES - bool "Enable locale support in C library and applications" - default n - help - Multilanguage support. - config ADK_DEBUG bool "Compile applications with debug support by default" default n diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index e2aec51aa..b90983ff1 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -16,7 +16,7 @@ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --with-__thread \ --with-tls \ --enable-add-ons \ - $(NLS) + --disable-nls EGLIBC_ENV:= PATH='${TARGET_PATH}' \ BUILD_CC=${CC_FOR_BUILD} \ GCC_HONOUR_COPTS=s \ |