From: Florian Fainelli Date: Tue, 28 Oct 2008 22:04:53 +0000 (+0000) Subject: Fix locations for the uClibc snapshot version (#4065) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9dd37f3d129937fcc107abad09b3e9fe0129a4f6;p=openwrt%2Fstaging%2Fnbd.git Fix locations for the uClibc snapshot version (#4065) SVN-Revision: 13067 --- diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index ccce335f39..4284353b7a 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -13,8 +13,10 @@ PKG_EXTRAVERSION:=$(call qstrip,$(CONFIG_UCLIBC_EXTRA_VERSION)) PKG_VERSION_SNAPSHOT:=$(call qstrip,$(CONFIG_UCLIBC_VERSION_SNAPSHOT)) ifeq ($(PKG_VERSION_SNAPSHOT),y) PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots +PKG_SOURCE:=uClibc-snapshot.tar.bz2 else PKG_SOURCE_URL:=http://www.uclibc.org/downloads +PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 endif PATCH_DIR:=./patches/$(PKG_VERSION)$(PKG_EXTRAVERSION) CONFIG_DIR:=./config/$(PKG_VERSION)$(PKG_EXTRAVERSION) @@ -37,12 +39,21 @@ PKG_MD5SUM:=61dc55f43b17a38a074f347e74095b20 endif endif -PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 +ifeq ($(PKG_VERSION_SNAPSHOT),y) +PATCH_DIR:= +CONFIG_DIR:=./config +PKG_MD5SUM:= +endif + PKG_CAT:=bzcat STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) +ifeq ($(PKG_VERSION_SNAPSHOT),y) +PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_EXTRAVERSION) +else PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) +endif override CONFIG_AUTOREBUILD= include $(INCLUDE_DIR)/host-build.mk