projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[ar71xx] update kernel config
[openwrt.git] / toolchain / uClibc / Makefile
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 5774d24..61dcaaa 100644 (file)
--- 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,56 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
-PKG_VERSION:=0.9.28
-PKG_EXTRAVERSION:=.2
+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
+  PKG_SOURCE:=uClibc-snapshot.tar.bz2
+else
+  PKG_SOURCE_URL:=http://www.uclibc.org/downloads
+  PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2
+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
+
+ifeq ($(PKG_VERSION),0.9.30)
+  ifeq ($(PKG_EXTRAVERSION),)
+    PKG_MD5SUM:=e5766e2566e0297adebebbcc0aba1f2d
+  endif
+endif
 
 
-PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.uclibc.org/downloads
-PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2
-PKG_CAT:=bzcat
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+  PATCH_DIR:=
+  CONFIG_DIR:=./config
+  PKG_MD5SUM:=
+endif
 
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION)
+else
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+endif
 
 
-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
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
 STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed
@@ -40,55 +77,110 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/cris.*/cris/' \
 )
 
                -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_PATCHVER\)=.*,\1=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk
+endef
+
+define Host/Prepare/Snapshot
+       $(PKG_UNPACK)
+       rm -Rf $(HOST_BUILD_DIR)
+       ln -snf $(BUILD_DIR_TOOLCHAIN)/uClibc $(HOST_BUILD_DIR)
+       $(Host/Patch)
+       $(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
+endef
+
+define Host/Prepare/V_0_9_28
+       $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(BUILD_DIR_TOOLCHAIN)/linux\",g' \
+               $(HOST_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' $(HOST_BUILD_DIR)/.config
+ endif
+ ifeq ($(CONFIG_C99_MATH),y)
+       $(SED) 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' $(HOST_BUILD_DIR)/.config
+ endif
+endef
+
+define Host/Prepare
+       $(call Host/SetToolchainInfo)
+       @echo prepare uClibc version $(PKG_VERSION)$(PKG_EXTRAVERSION)  
+ ifeq ($(PKG_VERSION_SNAPSHOT),y)
+       $(call Host/Prepare/Snapshot)
+ else
+       $(call Host/Prepare/Default)
+       ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+ endif
+       $(CP) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD)) $(HOST_BUILD_DIR)/.config
+ ifeq ($(PKG_VERSION),0.9.28)
+       $(call Host/Prepare/V_0_9_28)
+ endif
+       $(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,^.*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/ \
                DEVEL_PREFIX=/usr/ \
-               RUNTIME_PREFIX=$(BUILD_DIR_HOST)/uClibc_dev/ \
+               RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                HOSTCC="$(HOSTCC)" \
                HOSTCC="$(HOSTCC)" \
+               CC="$(TARGET_CC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
-               pregen install_dev;
+               pregen \
+               $(if $(CONFIG_UCLIBC_VERSION_0_9_28),install_dev,install_headers)
 endef
 
 endef
 
-define Build/Configure
+define Host/Configure
 endef
 
 endef
 
-UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
        $(TARGET_CONFIGURE_OPTS) \
        $(TARGET_CONFIGURE_OPTS) \
-       DEVEL_PREFIX=/ \
+       DEVEL_PREFIX=/usr/ \
        RUNTIME_PREFIX=/ \
        HOSTCC="$(HOSTCC)" \
        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
 
 endef
 
-define Build/Install
+define Host/Install
        $(UCLIBC_MAKE) PREFIX= utils
        $(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) \
        $(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
 
 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))
 endef
 
 $(eval $(call HostBuild))
Personal OpenWRT clone
This page took 0.03609 seconds and 4 git commands to generate.