aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-02-07 17:34:53 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-02-07 17:34:53 +0000
commit5c8783e02a544544c9b7fe432c8fd248eb11e08f (patch)
tree86217056706841e41298ca756ee2e3a0e453281a
parent5393efc0c7bef3c13f5c32d6a6507ba485fd7f00 (diff)
downloadupstream-5c8783e02a544544c9b7fe432c8fd248eb11e08f.tar.gz
upstream-5c8783e02a544544c9b7fe432c8fd248eb11e08f.tar.bz2
upstream-5c8783e02a544544c9b7fe432c8fd248eb11e08f.zip
toolchain/eglibc: add support for 2.17
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35515
-rw-r--r--toolchain/eglibc/Config.in5
-rw-r--r--toolchain/eglibc/Config.version1
-rw-r--r--toolchain/eglibc/common.mk5
3 files changed, 11 insertions, 0 deletions
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 2e3b73af7d..11f9abe11d 100644
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -13,6 +13,10 @@ choice
bool "eglibc 2.16"
depends !GCC_VERSION_LLVM
+ config EGLIBC_VERSION_2_17
+ bool "eglibc 2.17"
+ depends !GCC_VERSION_LLVM
+
endchoice
config EGLIBC_REVISION
@@ -20,6 +24,7 @@ config EGLIBC_REVISION
depends on TOOLCHAINOPTS && USE_EGLIBC
default "18909" if EGLIBC_VERSION_2_15
default "21110" if EGLIBC_VERSION_2_16
+ default "22243" if EGLIBC_VERSION_2_17
default ""
menu "eglibc configuration"
diff --git a/toolchain/eglibc/Config.version b/toolchain/eglibc/Config.version
index 496b90bf6b..92ba3e6ee0 100644
--- a/toolchain/eglibc/Config.version
+++ b/toolchain/eglibc/Config.version
@@ -3,4 +3,5 @@ config EGLIBC_VERSION
depends on USE_EGLIBC
default "2.15" if EGLIBC_VERSION_2_15
default "2.16" if EGLIBC_VERSION_2_16
+ default "2.17" if EGLIBC_VERSION_2_17
default "2.15"
diff --git a/toolchain/eglibc/common.mk b/toolchain/eglibc/common.mk
index 5c8dc117ec..483f57db82 100644
--- a/toolchain/eglibc/common.mk
+++ b/toolchain/eglibc/common.mk
@@ -21,6 +21,9 @@ endif
ifneq ($(CONFIG_EGLIBC_VERSION_2_16),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_16
endif
+ifneq ($(CONFIG_EGLIBC_VERSION_2_17),)
+ PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_17
+endif
PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
@@ -80,7 +83,9 @@ define Host/Prepare
$(call Host/Prepare/Default)
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
+ifneq ($(CONFIG_EGLIBC_VERSION_2_17),y)
ln -sf ../ports $(HOST_BUILD_DIR)/libc/
+endif
endef
define Host/Clean