diff options
| -rw-r--r-- | toolchain/uClibc/Config.in | 8 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 32 |
2 files changed, 16 insertions, 24 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index fde4a8523..b7678a356 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -41,6 +41,14 @@ config BR2_USE_UCLIBC_SNAPSHOT help Use latest snapshot or one from a specific date? +config BR2_UCLIBC_VERSION_STRING + string + default 0.9.28.3 if BR2_UCLIBC_VERSION_0_9_28_3 + default 0.9.29 if BR2_UCLIBC_VERSION_0_9_29 + default 0.9.30 if BR2_UCLIBC_VERSION_0_9_30 + default 0.9.30.1 if BR2_UCLIBC_VERSION_0_9_30_1 + default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT + config BR2_UCLIBC_CONFIG string "uClibc configuration file to use?" default "toolchain/uClibc/uClibc-0.9.28.config" if BR2_UCLIBC_VERSION_0_9_28_3 diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 48b543e4d..164c474f5 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -13,35 +13,21 @@ UCLIBC_CONFIG_FILE=$(subst ",, $(strip $(BR2_UCLIBC_CONFIG))) #") endif +UCLIBC_VER:=$(subst ",,$(BR2_UCLIBC_VERSION_STRING)) +#") + +UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE) + ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) -# Be aware that this changes daily.... -UCLIBC_VER:=0.9.30 -UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc -UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2 -#")) UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots -UCLIBC_PATCH_DIR:=toolchain/uClibc/ +UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc else -# releases -ifeq ($(BR2_UCLIBC_VERSION_0_9_30_1),y) -UCLIBC_VER:=0.9.30.1 -endif -ifeq ($(BR2_UCLIBC_VERSION_0_9_30),y) -UCLIBC_VER:=0.9.30 -endif -ifeq ($(BR2_UCLIBC_VERSION_0_9_29),y) -UCLIBC_VER:=0.9.29 -endif -ifeq ($(BR2_UCLIBC_VERSION_0_9_28_3),y) -UCLIBC_VER:=0.9.28.3 -endif +UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION) UCLIBC_SITE:=http://www.uclibc.org/downloads - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y) UCLIBC_SITE:=$(VENDOR_SITE) endif - -UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE) +endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) UCLIBC_PATCH_DIR:=toolchain/uClibc/ @@ -49,9 +35,7 @@ else UCLIBC_PATCH_DIR:=toolchain/uClibc/ext_source/$(VENDOR_PATCH_DIR)/$(UCLIBC_OFFICIAL_VERSION) endif -UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION) UCLIBC_SOURCE:=uClibc-$(UCLIBC_OFFICIAL_VERSION).tar.bz2 -endif UCLIBC_CAT:=$(BZCAT) |