X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/11c2779e23eb7e84693e246e550b41860ea05c7d..252bf0da28a26bb40cfd137ca46d6ecdb1ba49bd:/toolchain/uClibc/Makefile diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 5774d245b..e8407fb9c 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,22 +8,32 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=uClibc -PKG_VERSION:=0.9.28 -PKG_EXTRAVERSION:=.2 +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_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_SOURCE_VERSION).tar.gz + LIBC_SO_VERSION:=0.9.30-svn +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)$(PKG_EXTRAVERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.uclibc.org/downloads -PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2 -PKG_CAT:=bzcat +PKG_MD5SUM_0.9.29 = 61dc55f43b17a38a074f347e74095b20 +PKG_MD5SUM_0.9.30.1 = 1a4b84e5536ad8170563ffa88c34679c +PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) -PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) +HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION) -include $(INCLUDE_DIR)/host-build.mk +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/' \ @@ -40,55 +50,85 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/cris.*/cris/' \ ) -define Build/Prepare - $(call Build/Prepare/Default) - $(CP) config/$(ARCH)$(if $(wildcard config/$(ARCH).$(BOARD)),$(BOARD)) $(PKG_BUILD_DIR)/.config - $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ - -e 's,.*HAS_FPU.*,HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),g' \ + +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 + +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) + $(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/usr/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,.*DO_C99_MATH.*,DO_C99_MATH=$(if $(CONFIG_C99_MATH),y,n),g' \ - $(PKG_BUILD_DIR)/.config - mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/include - mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/lib - mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/lib - PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ - PREFIX=$(BUILD_DIR_HOST)/uClibc_dev/ \ + -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)/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/ \ - RUNTIME_PREFIX=$(BUILD_DIR_HOST)/uClibc_dev/ \ + RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \ HOSTCC="$(HOSTCC)" \ + CC="$(TARGET_CC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ - pregen install_dev; + pregen \ + install_headers endef -define Build/Configure +define Host/Configure endef -UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ +UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - DEVEL_PREFIX=/ \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ HOSTCC="$(HOSTCC)" \ - CPU_CFLAGS="$(TARGET_CFLAGS)" - -define Build/Compile - $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak - $(UCLIBC_MAKE) PREFIX= all - $(UCLIBC_MAKE) PREFIX=$(STAGING_DIR_HOST)/ install_runtime install_dev - $(SED) 's,UCLIBC_VERSION=.*,UCLIBC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,UCLIBC_PATCHVER=.*,UCLIBC_PATCHVER=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk + CPU_CFLAGS="$(TARGET_CFLAGS)" \ + DOSTRIP="" + +define Host/Compile + $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak + $(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 \ +# ) endef -define Build/Install +define Host/Install $(UCLIBC_MAKE) PREFIX= utils - $(INSTALL_DIR) $(TOOLCHAIN_DIR)/target-utils + $(INSTALL_DIR) $(TOOLCHAIN_DIR)/usr/bin + $(INSTALL_BIN) \ + $(HOST_BUILD_DIR)/utils/ldd \ + $(TOOLCHAIN_DIR)/usr/bin/ + $(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/utils/ldd \ - $(PKG_BUILD_DIR)/utils/ldconfig \ - $(TOOLCHAIN_DIR)/target-utils/ + $(HOST_BUILD_DIR)/utils/ldconfig \ + $(TOOLCHAIN_DIR)/sbin/ endef -define Build/Clean - rm -rf $(PKG_BUILD_DIR) $(BUILD_DIR_HOST)/uClibc_dev +define Host/Clean + rm -rf \ + $(HOST_BUILD_DIR) \ + $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \ + $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev endef $(eval $(call HostBuild))