diff options
Diffstat (limited to 'toolchain/uClibc/Makefile')
| -rw-r--r-- | toolchain/uClibc/Makefile | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 906767da22..e7304a171c 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -11,6 +11,14 @@ PKG_NAME:=uClibc PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) PKG_EXTRAVERSION:=$(call qstrip,$(CONFIG_UCLIBC_EXTRA_VERSION)) PKG_VERSION_SNAPSHOT:=$(call qstrip,$(CONFIG_UCLIBC_VERSION_SNAPSHOT)) +ifeq ($(CONFIG_UCLIBC_VERSION_NPTL),y) + PKG_SOURCE_URL:=http://www.uclibc.org/svn/branches/uClibc-nptl + PKG_SOURCE_PROTO:=svn + PKG_SOURCE_VERSION:=25804 + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)+nptl + PKG_SOURCE:=$(PKG_NAME)-nptl-r$(PKG_SOURCE_VERSION).tar.gz + PKG_EXTRAVERSION:= +else ifeq ($(PKG_VERSION_SNAPSHOT),y) PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots PKG_SOURCE:=uClibc-snapshot.tar.bz2 @@ -18,8 +26,13 @@ else PKG_SOURCE_URL:=http://www.uclibc.org/downloads PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 endif +endif PATCH_DIR:=$(firstword $(wildcard ./patches-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./patches-$(PKG_VERSION))) CONFIG_DIR:=$(firstword $(wildcard ./config-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./config-$(PKG_VERSION))) +PATCH_DIR:=$(if $(CONFIG_UCLIBC_VERSION_NPTL),./patches-nptl,$(PATCH_DIR)) +CONFIG_DIR:=$(if $(CONFIG_UCLIBC_VERSION_NPTL),./config-nptl,$(CONFIG_DIR)) +PATCH_DIR:=$(if $(PKG_VERSION_SNAPSHOT),,$(PATCH_DIR)) +CONFIG_DIR:=$(if $(PKG_VERSION_SNAPSHOT),./config-0.9.30,$(CONFIG_DIR)) PKG_MD5SUM_0.9.28.2 = 959f25286e317f0d9e2103445c5a14c2 PKG_MD5SUM_0.9.28.3 = 428405a36b4662980d9343b32089b5a6 @@ -27,16 +40,11 @@ PKG_MD5SUM_0.9.29 = 61dc55f43b17a38a074f347e74095b20 PKG_MD5SUM_0.9.30 = e5766e2566e0297adebebbcc0aba1f2d PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION)) -ifeq ($(PKG_VERSION_SNAPSHOT),y) - PATCH_DIR:= - CONFIG_DIR:=./config-0.9.30 - PKG_MD5SUM:= -endif ifeq ($(PKG_VERSION_SNAPSHOT),y) HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION) else - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) + HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl) endif include $(INCLUDE_DIR)/toolchain-build.mk |