X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9..aeee7fa7bf975f0cbcd86871dfa3950d9662774b:/toolchain/uClibc/Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index e8407fb9c..f1e6fedb8 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -10,11 +10,11 @@ include $(INCLUDE_DIR)/target.mk
 PKG_NAME:=uClibc
 PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 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_URL:=git://git.busybox.net/uClibc
+  PKG_SOURCE_PROTO:=git
+  PKG_SOURCE_VERSION:=0949826e9501e9f08767aeb476ea1464bf95f218
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_SOURCE_VERSION).tar.gz
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
   LIBC_SO_VERSION:=0.9.30-svn
 else
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads
@@ -24,8 +24,8 @@ endif
 PATCH_DIR:=./patches-$(PKG_VERSION)
 CONFIG_DIR:=./config-$(PKG_VERSION)
 
-PKG_MD5SUM_0.9.29 = 61dc55f43b17a38a074f347e74095b20
 PKG_MD5SUM_0.9.30.1 = 1a4b84e5536ad8170563ffa88c34679c
+PKG_MD5SUM_0.9.30.2 = e759ec855500082ac3e671dd6cacfdb0
 PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
@@ -74,7 +74,7 @@ define Host/Prepare
 		-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
 		$(HOST_BUILD_DIR)/.config
 	$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
-	PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
+	PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
 		PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
@@ -88,12 +88,13 @@ endef
 define Host/Configure
 endef
 
-UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
+UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
 	$(TARGET_CONFIGURE_OPTS) \
 	DEVEL_PREFIX=/usr/ \
 	RUNTIME_PREFIX=/ \
 	HOSTCC="$(HOSTCC)" \
 	CPU_CFLAGS="$(TARGET_CFLAGS)" \
+	LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
 	DOSTRIP=""
 
 define Host/Compile
@@ -101,19 +102,22 @@ define Host/Compile
 	$(UCLIBC_MAKE) PREFIX= all
 	$(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
 	ln -sf ../../lib/libc.so.0 $(TOOLCHAIN_DIR)/usr/lib/libc.so
-#	( cd $(TOOLCHAIN_DIR) ; \
-#		for d in lib usr/lib ; do \
-#		  for f in libc.so libpthread.so libgcc_s.so ; do \
-#		    if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
-#		      $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
-#		    fi \
-#		  done \
-#		done \
-#	)
+	$(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/usr/lib/
+	$(CP) $(HOST_BUILD_DIR)/libpthread/*/libpthread_so.a $(TOOLCHAIN_DIR)/usr/lib/
+	( cd $(TOOLCHAIN_DIR) ; \
+		for d in lib usr/lib ; do \
+		  for f in libc.so libpthread.so libgcc_s.so ; do \
+		    if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
+		      $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
+		    fi \
+		  done \
+		done \
+	)
 endef
 
 define Host/Install
 	$(UCLIBC_MAKE) PREFIX= utils
+	$(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin
 	$(INSTALL_DIR) $(TOOLCHAIN_DIR)/usr/bin
 	$(INSTALL_BIN) \
 		$(HOST_BUILD_DIR)/utils/ldd \