diff options
| -rw-r--r-- | package/busybox/busybox.mk | 8 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 497aa76a0..de7866137 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -16,12 +16,12 @@ BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads endif BUSYBOX_UNZIP=bzcat -BUSYBOX_CONFIG:=package/busybox/busybox.config +BUSYBOX_CONFIG_FILE:=package/busybox/busybox.config $(DL_DIR)/$(BUSYBOX_SOURCE): $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) -busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) +busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - @@ -29,8 +29,8 @@ $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-\*.patch touch $(BUSYBOX_DIR)/.unpacked -$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG) - cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config +$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE) + cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\ PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak ifeq ($(BR2_LARGEFILE),y) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index d104ce145..5d4b0a6a2 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -4,6 +4,12 @@ # ############################################################# +ifeq ($(BR2_ENABLE_LOCALE),y) +UCLIBC_CONFIG_FILE:=toolchain/uClibc/uClibc.config-locale +else +UCLIBC_CONFIG_FILE:=toolchain/uClibc/uClibc.config +endif + ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) # Be aware that this changes daily.... UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc @@ -44,11 +50,7 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak -ifeq ($(BR2_ENABLE_LOCALE),y) - cp toolchain/uClibc/uClibc.config-locale $(UCLIBC_DIR)/.config -else - cp toolchain/uClibc/uClibc.config $(UCLIBC_DIR)/.config -endif + cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config $(SED) 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \ $(UCLIBC_DIR)/.config $(SED) 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config |