toolchain/glibc: remove broken eglibc 2.15 support

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44976

diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in
index 72d306e7a49ada2db0349582a7bca9382cd7c662..66ff2f4ff5c3cd764ba17751dfa68e55a8518c3c 100644 (file)
--- a/toolchain/glibc/Config.in
+++ b/toolchain/glibc/Config.in
@@ -5,11 +5,6 @@ choice
        help
          Select the version of glibc you wish to use.
 
-       config EGLIBC_USE_VERSION_2_15
-               bool "eglibc 2.15"
-               select EGLIBC_VERSION_2_15
-               depends on BROKEN
-
        config EGLIBC_USE_VERSION_2_19
                bool "eglibc 2.19"
                select EGLIBC_VERSION_2_19
@@ -21,6 +16,6 @@ choice
 endchoice
 
 menu "eglibc configuration"
-       depends on TOOLCHAINOPTS && USE_GLIBC && (EGLIBC_USE_VERSION_2_15 || EGLIBC_USE_VERSION_2_19)
+       depends on TOOLCHAINOPTS && USE_GLIBC && EGLIBC_USE_VERSION_2_19
        source toolchain/glibc/config/Config.in
 endmenu

diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version
index b4b2fcb4d221e7664e949ab1397ce6268f345399..0d84df217576b7d135d65ba0ce1f2de83fe387ae 100644 (file)
--- a/toolchain/glibc/Config.version
+++ b/toolchain/glibc/Config.version
@@ -2,13 +2,9 @@ if USE_GLIBC
 
 config GLIBC_VERSION
        string
-       default "2.15" if EGLIBC_VERSION_2_15
        default "2.19" if EGLIBC_VERSION_2_19
        default "2.21" if GLIBC_VERSION_2_21
 
-config EGLIBC_VERSION_2_15
-       bool
-
 config EGLIBC_VERSION_2_19
        default y if !TOOLCHAINOPTS
        bool
@@ -19,7 +15,6 @@ config GLIBC_VERSION_2_21
 
 config GLIBC_REVISION
        string
-       default "18909" if EGLIBC_VERSION_2_15
        default "25243" if EGLIBC_VERSION_2_19
        default "4e42b5b8f8" if GLIBC_VERSION_2_21
        default ""

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index e985de61b957f77492a8bd7b6a4d38bad17019f2..7487ca2782d9068101372b07742e8ed731e13b52 100644 (file)
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -17,12 +17,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
 
 GLIBC_PATH:=
-ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
-  GLIBC_PATH:=libc/
-  PKG_SOURCE_PROTO:=svn
-  PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15
-endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
   GLIBC_PATH:=libc/
   PKG_SOURCE_PROTO:=svn
@@ -105,9 +99,6 @@ define Host/Prepare
        ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 ifeq ($(CONFIG_GLIBC_VERSION_2_21),)
        $(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
-ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
-       ln -sf ../ports $(HOST_BUILD_DIR)/libc/
-endif
 endif
 endef