X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Feglibc%2FMakefile;h=b72b4bd3567816e0a92406a45faa3e5f6b0dad91;hb=97d70dd8598d81077ffff6db013511670ee9aaad;hp=e9e1d00da510253dbb8c47cbeac2d6a613ffe3ed;hpb=c3c59f418996d48f4df202e480a34f32c90f8ee5;p=openwrt-10.03%2F.git

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index e9e1d00da..b72b4bd35 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 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.
@@ -14,37 +14,37 @@ PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REVISION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
-ifeq ($(PKG_VERSION),2.6.1)
+
+ifneq ($(CONFIG_EGLIBC_VERSION_2_6),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_6
 endif
-ifeq ($(PKG_VERSION),2.7)
+ifneq ($(CONFIG_EGLIBC_VERSION_2_7),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_7
 endif
-ifeq ($(PKG_VERSION),2.8)
+ifneq ($(CONFIG_EGLIBC_VERSION_2_8),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_8
 endif
-ifeq ($(PKG_VERSION),2.9)
+ifneq ($(CONFIG_EGLIBC_VERSION_2_9),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_9
 endif
-ifeq ($(PKG_VERSION),trunk)
+ifneq ($(CONFIG_EGLIBC_VERSION_2_10),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_10
+endif
+ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk
 endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
-
-override CONFIG_AUTOREBUILD=
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built
-STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
+HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
 
-PKG_BUILD_DIR1:=$(PKG_BUILD_DIR)-initial
-PKG_BUILD_DIR2:=$(PKG_BUILD_DIR)-final
+HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
+HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 
 # XXX: {e,}glibc does not build w/ -Os
 # http://sourceware.org/bugzilla/show_bug.cgi?id=5203
@@ -54,7 +54,8 @@ EGLIBC_CONFIGURE:= \
 	BUILD_CC="$(HOSTCC)" \
 	$(TARGET_CONFIGURE_OPTS) \
 	CFLAGS="$(EGLIBC_CFLAGS)" \
-	$(PKG_BUILD_DIR)/libc/configure \
+	libc_cv_slibdir="/lib" \
+	$(HOST_BUILD_DIR)/libc/configure \
 		--prefix=/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(REAL_GNU_TARGET_NAME) \
@@ -65,26 +66,28 @@ EGLIBC_CONFIGURE:= \
 		--enable-add-ons \
 
 ifeq ($(CONFIG_SOFT_FLOAT),)
-  EGLIBC_CONFIGURE+= --with-fp
+  EGLIBC_CONFIGURE+= \
+	--with-fp
 else
-  EGLIBC_CONFIGURE+= --without-fp
+  EGLIBC_CONFIGURE+= \
+	--without-fp
 endif
 
 EGLIBC_MAKE:= \
 	$(MAKE) \
 
 
-define Build/SetToolchainInfo
+define Host/SetToolchainInfo
 	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
 	$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.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
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 endef
 
 define Stage1/Configure
-	mkdir -p $(PKG_BUILD_DIR1)
-	$(CP) $(PKG_BUILD_DIR)/libc/option-groups.config $(PKG_BUILD_DIR1)/
-	( cd $(PKG_BUILD_DIR1); rm -f config.cache; \
+	mkdir -p $(HOST_BUILD_DIR1)
+	$(CP) $(HOST_BUILD_DIR)/libc/option-groups.config $(HOST_BUILD_DIR1)/
+	( cd $(HOST_BUILD_DIR1); rm -f config.cache; \
 		$(EGLIBC_CONFIGURE) \
 	);
 endef
@@ -94,13 +97,13 @@ endef
 
 define Stage1/Install
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/{include,lib}
-	$(EGLIBC_MAKE) -C $(PKG_BUILD_DIR1) \
+	$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR1) \
 		install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \
 		install-bootstrap-headers=yes \
 		install-headers 
-	$(EGLIBC_MAKE) -C $(PKG_BUILD_DIR1) \
+	$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR1) \
 		csu/subdir_lib
-	( cd $(PKG_BUILD_DIR1); \
+	( cd $(HOST_BUILD_DIR1); \
 		$(CP) csu/crt1.o csu/crti.o csu/crtn.o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/lib/ \
 	)
 	$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
@@ -108,19 +111,19 @@ define Stage1/Install
 endef
 
 define Stage2/Configure
-	mkdir -p $(PKG_BUILD_DIR2)
-	$(CP) $(PKG_BUILD_DIR)/libc/option-groups.config $(PKG_BUILD_DIR2)/
-	( cd $(PKG_BUILD_DIR2); rm -f config.cache; \
+	mkdir -p $(HOST_BUILD_DIR2)
+	$(CP) $(HOST_BUILD_DIR)/libc/option-groups.config $(HOST_BUILD_DIR2)/
+	( cd $(HOST_BUILD_DIR2); rm -f config.cache; \
 		$(EGLIBC_CONFIGURE) \
 	);
 endef
 
 define Stage2/Compile
-	$(EGLIBC_MAKE) -C $(PKG_BUILD_DIR2) all
+	$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR2) all
 endef
 
 define Stage2/Install
-	$(EGLIBC_MAKE) -C $(PKG_BUILD_DIR2) \
+	$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR2) \
 		install_root="$(TOOLCHAIN_DIR)" \
 		install
 	( cd $(TOOLCHAIN_DIR) ; \
@@ -134,33 +137,33 @@ define Stage2/Install
 	)
 endef
 
-define Build/Prepare
-	$(call Build/SetToolchainInfo)
-	$(call Build/Prepare/Default)
+define Host/Prepare
+	$(call Host/SetToolchainInfo)
+	$(call Host/Prepare/Default)
 	ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
-	$(SED) 's,y,n,' $(PKG_BUILD_DIR)/libc/option-groups.defaults
-	grep 'CONFIG_EGLIBC_OPTION_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_EGLIBC_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/libc/option-groups.config
-	ln -sf ../ports $(PKG_BUILD_DIR)/libc/
-	( cd $(PKG_BUILD_DIR)/libc; autoconf --force )
+	$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
+	grep 'CONFIG_EGLIBC_OPTION_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_EGLIBC_\\(.*\\),\\1\\2,g" > $(HOST_BUILD_DIR)/libc/option-groups.config
+	ln -sf ../ports $(HOST_BUILD_DIR)/libc/
+	( cd $(HOST_BUILD_DIR)/libc; autoconf --force )
 	$(call Stage1/Configure)
 	$(call Stage1/Compile)
 	$(call Stage1/Install)
 endef
 
-define Build/Configure
+define Host/Configure
 endef
 
-define Build/Compile
+define Host/Compile
 	$(call Stage2/Configure)
 	$(call Stage2/Compile)
 	$(call Stage2/Install)
 endef
 
-define Build/Install
+define Host/Install
 endef
 
-define Build/Clean
-	rm -rf $(PKG_BUILD_DIR) $(PKG_BUILD_DIR1) $(PKG_BUILD_DIR2) \
+define Host/Clean
+	rm -rf $(HOST_BUILD_DIR) $(HOST_BUILD_DIR1) $(HOST_BUILD_DIR2) \
 		$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
 		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 endef