X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e71556383a9621b256fb791584f229bcc86df5d5..13e0098939bc3c67dd0f2e9b395318c4914b56de:/toolchain/eglibc/Makefile?ds=inline diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index f949f185a..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,27 +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 @@ -52,15 +40,15 @@ HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed 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 -EGLIBC_CFLAGS:=$(subst -Os,-O2,$(TARGET_CFLAGS)) +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) \