projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix a segfault in uclibc ldso.
[openwrt.git] / toolchain / uClibc / Makefile
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 7fdba8a..ccce335 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,21 +8,53 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
-PKG_VERSION:=0.9.28
-
-PKG_SOURCE:=uClibc-$(PKG_VERSION).tar.bz2
+PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
+PKG_EXTRAVERSION:=$(call qstrip,$(CONFIG_UCLIBC_EXTRA_VERSION))
+PKG_VERSION_SNAPSHOT:=$(call qstrip,$(CONFIG_UCLIBC_VERSION_SNAPSHOT))
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots
+else
 PKG_SOURCE_URL:=http://www.uclibc.org/downloads
-PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
+endif
+PATCH_DIR:=./patches/$(PKG_VERSION)$(PKG_EXTRAVERSION)
+CONFIG_DIR:=./config/$(PKG_VERSION)$(PKG_EXTRAVERSION)
+
+ifeq ($(PKG_VERSION),0.9.28)
+ifeq ($(PKG_EXTRAVERSION),.2)
+PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2
+endif
+ifeq ($(PKG_EXTRAVERSION),.3)
+PKG_MD5SUM:=428405a36b4662980d9343b32089b5a6
+endif
+endif
+
+ifeq ($(PKG_VERSION),0.9.29)
+ifeq ($(PKG_EXTRAVERSION),)
+# currently the default version, no special sub-directory needed
+PATCH_DIR:=./patches
+CONFIG_DIR:=./config
+PKG_MD5SUM:=61dc55f43b17a38a074f347e74095b20
+endif
+endif
+
+PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+override CONFIG_AUTOREBUILD=
 
 include $(INCLUDE_DIR)/host-build.mk
 
+STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
+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,35 +65,77 @@ 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
+# Remove me when there are no 2.6.23 targets
+ifeq ($(findstring 86,$(ARCH)),86)
+  ifneq ($(LINUX_2_6_23),y)
+       UCLIBC_TARGET_ARCH:=x86
+  endif
+endif
+
+define Build/Prepare/Snapshot
+       $(PKG_UNPACK)
+       rm -Rf $(PKG_BUILD_DIR)
+       ln -snf $(BUILD_DIR_TOOLCHAIN)/uClibc $(PKG_BUILD_DIR)
+       $(Build/Patch)
+       $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
+
+define Build/Prepare/V_0_9_28
        $(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
 ifeq ($(CONFIG_C99_MATH),y)
        $(SED) 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' $(PKG_BUILD_DIR)/.config
 endif
-       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include
-       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib
-       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib
+endef
+
+define Build/Prepare
+       @echo prepare uClibc version $(PKG_VERSION)$(PKG_EXTRAVERSION)  
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+       $(call Build/Prepare/Snapshot)
+else
+       $(call Build/Prepare/Default)
+endif
+       $(CP) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD)) $(PKG_BUILD_DIR)/.config
+ifeq ($(PKG_VERSION),0.9.28)
+       $(call Build/Prepare/V_0_9_28)
+endif
+       $(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
+               -e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),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' \
+               $(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
+#      if [ ! -f $(BUILD_DIR_HOST)/uClibc_dev/usr/include/linux/version.h ] ; then \
+#              cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/* $(BUILD_DIR_HOST)/uClibc_dev/usr/include/; \
+#              cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/* $(TOOLCHAIN_DIR)/include/ ; \
+#              cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/* $(PKG_BUILD_DIR)/include/ ; \
+#      fi;
+       if [ ! -f $(BUILD_DIR_HOST)/uClibc_dev/usr/include/linux/version.h ] ; then \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm $(BUILD_DIR_HOST)/uClibc_dev/usr/include/; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(UCLIBC_TARGET_ARCH) $(BUILD_DIR_HOST)/uClibc_dev/usr/include/; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic $(BUILD_DIR_HOST)/uClibc_dev/usr/include/; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/linux $(BUILD_DIR_HOST)/uClibc_dev/usr/include/; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm $(TOOLCHAIN_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(UCLIBC_TARGET_ARCH) $(TOOLCHAIN_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic $(TOOLCHAIN_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/linux $(TOOLCHAIN_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm $(PKG_BUILD_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic $(PKG_BUILD_DIR)/include/ ; \
+               cp -pLR $(BUILD_DIR_TOOLCHAIN)/linux/include/linux $(PKG_BUILD_DIR)/include/ ; \
+       fi;
+       $(MAKE) -C $(PKG_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
        PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
+               PREFIX=$(BUILD_DIR_HOST)/uClibc_dev/ \
                DEVEL_PREFIX=/usr/ \
-               RUNTIME_PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
+               RUNTIME_PREFIX=$(BUILD_DIR_HOST)/uClibc_dev/ \
                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                pregen install_dev;
@@ -70,32 +144,34 @@ endef
 define Build/Configure
 endef
 
+UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(TARGET_CONFIGURE_OPTS) \
+       DEVEL_PREFIX=/ \
+       RUNTIME_PREFIX=/ \
+       HOSTCC="$(HOSTCC)" \
+       CPU_CFLAGS="$(TARGET_CFLAGS)"
+
 define Build/Compile
-       PATH=$(TARGET_PATH) $(MAKE) -j $(CONFIG_JLEVEL) -C $(PKG_BUILD_DIR) \
-               PREFIX= \
-               DEVEL_PREFIX=/ \
-               RUNTIME_PREFIX=/ \
-               HOSTCC="$(HOSTCC)" \
-               CPU_CFLAGS="$(TARGET_CFLAGS)" \
-               all
+       $(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
+       rm -rf $(TOOLCHAIN_DIR)/lib/libc.so
+       ln -s libc.so.0 $(TOOLCHAIN_DIR)/lib/libc.so
 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
+       $(UCLIBC_MAKE) PREFIX= utils
+       $(INSTALL_DIR) $(TOOLCHAIN_DIR)/target-utils
+       $(INSTALL_BIN) \
+               $(PKG_BUILD_DIR)/utils/ldd \
+               $(PKG_BUILD_DIR)/utils/ldconfig \
+               $(TOOLCHAIN_DIR)/target-utils/
 endef
 
 define Build/Clean
-       rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev
+       rm -rf $(PKG_BUILD_DIR) $(BUILD_DIR_HOST)/uClibc_dev
 endef
 
 $(eval $(call HostBuild))
Personal OpenWRT clone
This page took 0.034195 seconds and 4 git commands to generate.