change the recursive dependency template to use more make evaluation - the shell...

[openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 7206df2..c5dea08 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,5 +1,7 @@
+
+
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +11,13 @@ include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
 PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
-ifeq ($(CONFIG_UCLIBC_VERSION_NPTL),y)
+ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
   PKG_SOURCE_URL:=git://git.busybox.net/uClibc
   PKG_SOURCE_PROTO:=git
-  PKG_SOURCE_VERSION:=0949826e9501e9f08767aeb476ea1464bf95f218
+  PKG_SOURCE_VERSION:=22bf234a7119559901adfedc9991876af01eb64c
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-  LIBC_SO_VERSION:=0.9.30-svn
+  LIBC_SO_VERSION:=$(PKG_VERSION)-git
 else
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -24,8 +26,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.31   = 52fb8a494758630c8d3ddd7f1e0daafd
 PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
@@ -58,14 +60,23 @@ define Host/SetToolchainInfo
        $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(LIBC_SO_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 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))
+GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
+       $(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \
+       $(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \
+       $(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); \
+               if $(QUILT_CMD) next >/dev/null 2>&1; then \
+                       $(QUILT_CMD) push -a; \
+               fi
+       )
        ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        $(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config
-       $(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include\",g' \
+       $(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/include\",g' \
                -e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \
                -e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
                -e 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),y,n),g' \
@@ -73,14 +84,16 @@ define Host/Prepare
                -e 's,^.*CONFIG_ARM_OABI.*,CONFIG_ARM_OABI=$(if $(CONFIG_EABI_SUPPORT),n,y),g' \
                -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
                $(HOST_BUILD_DIR)/.config
+       $(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
        $(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
        PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
                PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
-               DEVEL_PREFIX=/usr/ \
+               DEVEL_PREFIX=/ \
                RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                HOSTCC="$(HOSTCC)" \
                CC="$(TARGET_CC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
+               ARCH="$(CONFIG_ARCH)" \
                pregen \
                install_headers
 endef
@@ -88,39 +101,44 @@ endef
 define Host/Configure
 endef
 
+CPU_CFLAGS = \
+       -funsigned-char -fno-builtin -fno-asm \
+       --std=gnu99 -ffunction-sections -fdata-sections \
+       $(TARGET_CFLAGS)
+
 UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
        $(TARGET_CONFIGURE_OPTS) \
-       DEVEL_PREFIX=/usr/ \
+       DEVEL_PREFIX=/ \
        RUNTIME_PREFIX=/ \
        HOSTCC="$(HOSTCC)" \
-       CPU_CFLAGS="$(TARGET_CFLAGS)" \
+       CPU_CFLAGS="$(CPU_CFLAGS)" \
+       ARCH="$(CONFIG_ARCH)" \
        LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
        DOSTRIP=""
 
 define Host/Compile
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
-       $(UCLIBC_MAKE) PREFIX= all
+       $(UCLIBC_MAKE) $(TOOLCHAIN_JOBS) PREFIX= all
        $(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
-       ln -sf ../../lib/libc.so.0 $(TOOLCHAIN_DIR)/usr/lib/libc.so
-       $(CP) $(HOST_BUILD_DIR)/libc/libc_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 \
-#      )
+       $(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/lib/
+       $(CP) $(HOST_BUILD_DIR)/libpthread/*/libpthread_so.a $(TOOLCHAIN_DIR)/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 \
-               $(TOOLCHAIN_DIR)/usr/bin/
+               $(TOOLCHAIN_DIR)/bin/
        $(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin
        $(INSTALL_BIN) \
                $(HOST_BUILD_DIR)/utils/ldconfig \