X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/94266d638908a140ef5cdd9b27d2eb367f97249f..6135a9e06aa49cc4cc5e9dd8d12fde6beb887d21:/toolchain/uClibc/Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 22c591345..ce9acad44 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,21 +1,76 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
-PKG_VERSION:=0.9.28
+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)
 
-PKG_SOURCE:=uClibc-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.uclibc.org/downloads
-PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
-PKG_CAT:=bzcat
+ifeq ($(PKG_VERSION),0.9.28)
+  ifeq ($(PKG_EXTRAVERSION),.2)
+    PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2
+  endif
+  ifeq ($(PKG_EXTRAVERSION),.3)
+    PKG_MD5SUM:=428405a36b4662980d9343b32089b5a6
+  endif
+endif
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION)
+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
+
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+  PATCH_DIR:=
+  CONFIG_DIR:=./config
+  PKG_MD5SUM:=
+endif
+
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+ifeq ($(PKG_VERSION_SNAPSHOT),y)
+  HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_EXTRAVERSION)
+else
+  HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+endif
+
+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' \
@@ -26,62 +81,110 @@ 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
-	$(CP) ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
-	$(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
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+
+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,^.*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=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+		RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
 		HOSTCC="$(HOSTCC)" \
+		CC="$(TARGET_CC)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
-		pregen install_dev;
+		pregen \
+		$(if $(CONFIG_UCLIBC_VERSION_0_9_28),install_dev,install_headers)
 endef
 
-define Build/Configure
+define Host/Configure
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PREFIX= \
-		DEVEL_PREFIX=/ \
-		RUNTIME_PREFIX=/ \
-		HOSTCC="$(HOSTCC)" \
-		CPU_CFLAGS="$(TARGET_CFLAGS)" \
-		all
+UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
+	$(TARGET_CONFIGURE_OPTS) \
+	DEVEL_PREFIX=/usr/ \
+	RUNTIME_PREFIX=/ \
+	HOSTCC="$(HOSTCC)" \
+	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
-	$(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/Install
+	$(UCLIBC_MAKE) PREFIX= 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) \
+		$(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))