uClibc: set the toolchain info at install time instead of prepare time, fixes staging...

[openwrt/staging/lynxis/omap.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index f522903563fce0642a94ce1b902f97f6fa4c003c..642f7fba4cdf516b27c0a8fd9a2a23d6e86870c3 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 ifeq ($(PKG_VERSION),0.9.32)
   PKG_SOURCE_URL:=git://git.busybox.net/uClibc
   PKG_SOURCE_PROTO:=git
-  PKG_SOURCE_VERSION:=269f901e62106e2d36acf4c2b79a9a5ec6d684ff
+  PKG_SOURCE_VERSION:=9112a2398ec58b32cd1a1c6feae195bd8f9a46a2
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
   LIBC_SO_VERSION:=$(PKG_VERSION)-rc2-git
@@ -24,8 +24,6 @@ endif
 PATCH_DIR:=./patches-$(PKG_VERSION)
 CONFIG_DIR:=./config-$(PKG_VERSION)
 
-PKG_MD5SUM_0.9.30.1 = 1a4b84e5536ad8170563ffa88c34679c
-PKG_MD5SUM_0.9.31   = 52fb8a494758630c8d3ddd7f1e0daafd
 PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
@@ -64,7 +62,6 @@ GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
        $(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD))
 
 define Host/Prepare
-       $(call Host/SetToolchainInfo)
        $(call Host/Prepare/Default)
        $(if $(strip $(QUILT)), \
                cd $(HOST_BUILD_DIR); \
@@ -128,9 +125,13 @@ define Host/Compile
                  done \
                done \
        )
+       rm -f \
+               $(TOOLCHAIN_DIR)/lib/libresolv*.so* \
+               $(TOOLCHAIN_DIR)/lib/libnsl*.so*
 endef
 
 define Host/Install
+       $(call Host/SetToolchainInfo)
        $(UCLIBC_MAKE) PREFIX= utils
        $(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin
        $(INSTALL_BIN) \