summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-12-15 13:39:26 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-12-15 13:39:26 +0000
commitf3489da09201aa8aadea2969bf6cb50898f73b14 (patch)
tree1ba95f08608be4557c279af45be439872eee6359
parentc854c670592419ff0fb5a2bcb865c55d47340123 (diff)
downloadbuildroot-novena-f3489da09201aa8aadea2969bf6cb50898f73b14.tar.gz
buildroot-novena-f3489da09201aa8aadea2969bf6cb50898f73b14.zip
- Only care about the locale stuff if we have locale in the first place.
-rw-r--r--toolchain/uClibc/uclibc.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 9d9128ead..5bb730a82 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -63,17 +63,24 @@ endif
$(DL_DIR)/$(UCLIBC_SOURCE):
mkdir -p $(DL_DIR)
$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
-
+ifneq ($(UCLIBC_HAS_LOCALE),)
$(DL_DIR)/$(UCLIBC_SOURCE_LOCALE):
mkdir -p $(DL_DIR)
$(WGET) -P $(DL_DIR) $(UCLIBC_SITE_LOCALE)/$(UCLIBC_SOURCE_LOCALE)
+UCLIBC_LOCALE_DATA:=$(DL_DIR)/$(UCLIBC_SOURCE_LOCALE)
+else
+UCLIBC_LOCALE_DATA=
+endif
+
uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE)
+$(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/
+endif
touch $(UCLIBC_DIR)/.unpacked
# Some targets may wish to provide their own UCLIBC_CONFIG_FILE...