Commit 290615ed authored by Eric Andersen's avatar Eric Andersen
Browse files

we use BR2_ENABLE_LOCALE not ENABLE_LOCALE

parent a47e16eb

package/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

toolchain/gdb/gdb.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

toolchain/uClibc/uclibc.mk

+5 −3
Original line number Diff line number Diff line
@@ -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