[toolchain]: switch to uClibc 0.9.31
[openwrt.git] / toolchain / uClibc / Makefile
index a99c734..7f9e2a3 100644 (file)
@@ -1,5 +1,7 @@
-# 
-# Copyright (C) 2006 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.
@@ -8,21 +10,38 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
-PKG_VERSION:=0.9.28
+PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
+ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
+  PKG_SOURCE_URL:=git://git.busybox.net/uClibc
+  PKG_SOURCE_PROTO:=git
+  PKG_SOURCE_VERSION:=ef487a35f428da6240003dca23b9d29908e2285e
+  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+  LIBC_SO_VERSION:=$(PKG_VERSION)-git
+else
+  PKG_SOURCE_URL:=http://www.uclibc.org/downloads
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+  LIBC_SO_VERSION:=$(PKG_VERSION)
+endif
+PATCH_DIR:=./patches-$(PKG_VERSION)
+CONFIG_DIR:=./config-$(PKG_VERSION)
 
-PKG_SOURCE:=uClibc-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.uclibc.org/downloads
-PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
-PKG_CAT:=bzcat
+PKG_MD5SUM_0.9.30.1 = 1a4b84e5536ad8170563ffa88c34679c
+PKG_MD5SUM_0.9.31   = 52fb8a494758630c8d3ddd7f1e0daafd
+PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+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/' \
                -e 's/sparc.*/sparc/' \
                -e 's/arm.*/arm/g' \
+               -e 's/avr32.*/avr32/g' \
                -e 's/m68k.*/m68k/' \
                -e 's/ppc/powerpc/g' \
                -e 's/v850.*/v850/g' \
@@ -33,66 +52,93 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/cris.*/cris/' \
 )
 
-define Build/Prepare
-       $(call Build/Prepare/Default)
-       $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
-       if [ -e config/$(ARCH).$(BOARD) ]; then \
-               $(CP) config/$(ARCH).$(BOARD) $(PKG_BUILD_DIR)/.config; \
-       else \
-               $(CP) config/$(ARCH) $(PKG_BUILD_DIR)/.config; \
-       fi
-       $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
-               $(PKG_BUILD_DIR)/.config
-ifeq ($(CONFIG_LARGEFILE),y)
-       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(PKG_BUILD_DIR)/.config
-else
-       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(PKG_BUILD_DIR)/.config
-endif
-       $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(PKG_BUILD_DIR)/.config
-ifeq ($(CONFIG_SOFT_FLOAT),y)
-       $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(PKG_BUILD_DIR)/.config
-endif
-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
-       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
-               DEVEL_PREFIX=/usr/ \
-               RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
-               HOSTCC="$(HOSTCC)" \
-               CPU_CFLAGS="$(TARGET_CFLAGS)" \
-               pregen install_dev;
-endef
 
-define Build/Configure
+define Host/SetToolchainInfo
+       $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
+       $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.uclibc.org/,' $(TOOLCHAIN_DIR)/info.mk
+       $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+       $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(LIBC_SO_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 endef
 
-define Build/Compile
-       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX= \
+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)
+       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/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' \
+               -e 's,^.*CONFIG_ARM_EABI.*,CONFIG_ARM_EABI=$(if $(CONFIG_EABI_SUPPORT),y,n),g' \
+               -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=/ \
-               RUNTIME_PREFIX=/ \
+               RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                HOSTCC="$(HOSTCC)" \
+               CC="$(TARGET_CC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
-               all
+               ARCH="$(CONFIG_ARCH)" \
+               pregen \
+               install_headers
 endef
 
-define Build/Install
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX=$(STAGING_DIR)/ \
-               DEVEL_PREFIX=/ \
-               RUNTIME_PREFIX=/ \
-               install_runtime
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX=$(STAGING_DIR)/ \
-               DEVEL_PREFIX=/ \
-               RUNTIME_PREFIX=/ \
-               install_dev
-       echo $(PKG_VERSION) > $(STAGING_DIR)/uclibc_version
+define Host/Configure
+endef
+
+UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
+       $(TARGET_CONFIGURE_OPTS) \
+       DEVEL_PREFIX=/ \
+       RUNTIME_PREFIX=/ \
+       HOSTCC="$(HOSTCC)" \
+       CPU_CFLAGS="$(TARGET_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) $(TOOLCHAIN_JOBS) PREFIX= all
+       $(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
+       $(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_BIN) \
+               $(HOST_BUILD_DIR)/utils/ldd \
+               $(TOOLCHAIN_DIR)/bin/
+       $(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin
+       $(INSTALL_BIN) \
+               $(HOST_BUILD_DIR)/utils/ldconfig \
+               $(TOOLCHAIN_DIR)/sbin/
 endef
 
-define Build/Clean
-       rm -rf $(PKG_BUILD_DIR) $(TOOL_BUILD_DIR)/uClibc_dev
+define Host/Clean
+       rm -rf \
+               $(HOST_BUILD_DIR) \
+               $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
+               $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev
 endef
 
 $(eval $(call HostBuild))
This page took 0.024451 seconds and 4 git commands to generate.