X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2f83c80a22a2750b7812f65c2ffb99ba00a5695d..52b72cdab75ac5e82ce71d2190dc6e779fd9a9b0:/toolchain/eglibc/Makefile

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 6be809745..7d964bacf 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,30 +15,15 @@ PKG_SOURCE_VERSION:=$(PKG_REVISION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
 
-ifneq ($(CONFIG_EGLIBC_VERSION_2_6),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_6
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_7),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_7
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_8),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_8
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_9),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_9
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_10),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_10
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_11),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_11
-endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_12),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_12
 endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_13),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_13
 endif
+ifneq ($(CONFIG_EGLIBC_VERSION_2_14),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_14
+endif
 ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk
 endif
@@ -55,11 +40,15 @@ HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 
+EGLIBC_CFLAGS:= \
+	$(TARGET_CFLAGS)
+
 EGLIBC_CONFIGURE:= \
 	BUILD_CC="$(HOSTCC)" \
 	$(TARGET_CONFIGURE_OPTS) \
 	CFLAGS="$(EGLIBC_CFLAGS)" \
 	libc_cv_slibdir="/lib" \
+	use_ldconfig=no \
 	$(HOST_BUILD_DIR)/libc/configure \
 		--prefix= \
 		--build=$(GNU_HOST_NAME) \