uClibc NPTL: remove the pthread daemon() fix and revert r15343

[openwrt/staging/chunkeey.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 61dcaaaff5ef561817b61a31fd132535a2cb94bd..d7e1ed2e67b2ca9570ebd7f7b000c2b002679ac4 100644 (file)
--- 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:=-svn
+else
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots
   PKG_SOURCE:=uClibc-snapshot.tar.bz2
@@ -18,49 +26,32 @@ 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)
-
-ifeq ($(PKG_VERSION),0.9.28)
-  ifeq ($(PKG_EXTRAVERSION),.2)
-    PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2
-  endif
-  ifeq ($(PKG_EXTRAVERSION),.3)
-    PKG_MD5SUM:=428405a36b4662980d9343b32089b5a6
-  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))
 
-ifeq ($(PKG_VERSION),0.9.29)
-  ifeq ($(PKG_EXTRAVERSION),)
-    # currently the default version, no special sub-directory needed
-    PATCH_DIR:=./patches
-    CONFIG_DIR:=./config
-    PKG_MD5SUM:=61dc55f43b17a38a074f347e74095b20
-  endif
-endif
+PKG_MD5SUM_0.9.28.2 = 959f25286e317f0d9e2103445c5a14c2
+PKG_MD5SUM_0.9.28.3 = 428405a36b4662980d9343b32089b5a6
+PKG_MD5SUM_0.9.29 = 61dc55f43b17a38a074f347e74095b20
+PKG_MD5SUM_0.9.30 = e5766e2566e0297adebebbcc0aba1f2d
+PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION))
 
-ifeq ($(PKG_VERSION),0.9.30)
-  ifeq ($(PKG_EXTRAVERSION),)
-    PKG_MD5SUM:=e5766e2566e0297adebebbcc0aba1f2d
-  endif
-endif
 
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
-  PATCH_DIR:=
-  CONFIG_DIR:=./config
-  PKG_MD5SUM:=
-endif
-
-ifeq ($(PKG_VERSION_SNAPSHOT),y)
-  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION)
+  UCLIBC_SUBDIR:=uClibc-$(PKG_EXTRAVERSION)
 else
-  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+  UCLIBC_SUBDIR:=uClibc-$(PKG_VERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl,$(PKG_EXTRAVERSION))
 endif
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(UCLIBC_SUBDIR)
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 
-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
-STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed
+HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed
 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/i.86/i386/' \
@@ -88,7 +79,6 @@ endef
 define Host/Prepare/Snapshot
        $(PKG_UNPACK)
        rm -Rf $(HOST_BUILD_DIR)
-       ln -snf $(BUILD_DIR_TOOLCHAIN)/uClibc $(HOST_BUILD_DIR)
        $(Host/Patch)
        $(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
 endef
@@ -104,6 +94,8 @@ define Host/Prepare/V_0_9_28
  endif
 endef
 
+GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n $(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD))
+
 define Host/Prepare
        $(call Host/SetToolchainInfo)
        @echo prepare uClibc version $(PKG_VERSION)$(PKG_EXTRAVERSION)  
@@ -111,9 +103,9 @@ define Host/Prepare
        $(call Host/Prepare/Snapshot)
  else
        $(call Host/Prepare/Default)
-       ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
  endif
-       $(CP) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD)) $(HOST_BUILD_DIR)/.config
+       ln -snf $(UCLIBC_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+       $(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config
  ifeq ($(PKG_VERSION),0.9.28)
        $(call Host/Prepare/V_0_9_28)
  endif