From c5640c4c9747755b123a3eed5343916e300c762d Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 15 Dec 2006 14:40:55 +0000 Subject: [PATCH] - s/UCLIBC_HAS_LOCALE/BR2_ENABLE_LOCALE/g --- toolchain/uClibc/uclibc.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 5bb730a82e..d66c5bccf3 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -26,9 +26,6 @@ endif endif UCLIBC_CAT:=$(BZCAT) -UCLIBC_SITE_LOCALE:=http://www.uclibc.org/downloads -UCLIBC_SOURCE_LOCALE:=uClibc-locale-030818.tgz - UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ @@ -63,7 +60,11 @@ endif $(DL_DIR)/$(UCLIBC_SOURCE): mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE) -ifneq ($(UCLIBC_HAS_LOCALE),) + +ifneq ($(BR2_ENABLE_LOCALE),) +UCLIBC_SITE_LOCALE:=http://www.uclibc.org/downloads +UCLIBC_SOURCE_LOCALE:=uClibc-locale-030818.tgz + $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE): mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(UCLIBC_SITE_LOCALE)/$(UCLIBC_SOURCE_LOCALE) @@ -78,8 +79,8 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA) mkdir -p $(TOOL_BUILD_DIR) $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ uClibc-$(UCLIBC_VER)\*.patch -ifneq ($(UCLIBC_HAS_LOCALE),) - cp -p $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/ +ifneq ($(BR2_ENABLE_LOCALE),) + cp -dpf $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/ endif touch $(UCLIBC_DIR)/.unpacked -- 2.30.2