Author: nbd Date: 2015-03-25 15:29:23 +0100 (Wed, 25 Mar 2015) New Revision: 44976
Modified: trunk/toolchain/glibc/Config.in trunk/toolchain/glibc/Config.version trunk/toolchain/glibc/common.mk Log: toolchain/glibc: remove broken eglibc 2.15 support Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/toolchain/glibc/Config.in =================================================================== --- trunk/toolchain/glibc/Config.in 2015-03-25 14:29:17 UTC (rev 44975) +++ trunk/toolchain/glibc/Config.in 2015-03-25 14:29:23 UTC (rev 44976) @@ -5,11 +5,6 @@ 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 @@ 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 Modified: trunk/toolchain/glibc/Config.version =================================================================== --- trunk/toolchain/glibc/Config.version 2015-03-25 14:29:17 UTC (rev 44975) +++ trunk/toolchain/glibc/Config.version 2015-03-25 14:29:23 UTC (rev 44976) @@ -2,13 +2,9 @@ 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_REVISION string - default "18909" if EGLIBC_VERSION_2_15 default "25243" if EGLIBC_VERSION_2_19 default "4e42b5b8f8" if GLIBC_VERSION_2_21 default "" Modified: trunk/toolchain/glibc/common.mk =================================================================== --- trunk/toolchain/glibc/common.mk 2015-03-25 14:29:17 UTC (rev 44975) +++ trunk/toolchain/glibc/common.mk 2015-03-25 14:29:23 UTC (rev 44976) @@ -17,12 +17,6 @@ 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,10 +99,7 @@ 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 define Host/Clean _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
