Browse Source

get rid of unsupported locale support

Waldemar Brodkorb 10 years ago
parent
commit
36b8021619
7 changed files with 2 additions and 21 deletions
  1. 0 1
      mk/build.mk
  2. 1 1
      mk/pkg-bottom.mk
  3. 0 6
      mk/vars.mk
  4. 0 3
      package/eglibc/Makefile
  5. 0 3
      package/glibc/Makefile
  6. 0 6
      target/config/Config.in.adk
  7. 1 1
      toolchain/eglibc/Makefile.inc

+ 0 - 1
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 \

+ 1 - 1
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

+ 0 - 6
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

+ 0 - 3
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

+ 0 - 3
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

+ 0 - 6
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

+ 1 - 1
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 \