caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toolchain/glibc: remove broken eglibc 2.15 support

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44976
This commit is contained in:
Felix Fietkau 2015-03-25 14:29:23 +00:00
parent 6aba44bfe0
commit 2efb6be426
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolchain/glibc/Config.in
View File

@ -5,11 +5,6 @@ choice
help help
Select the version of glibc you wish to use. 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 config EGLIBC_USE_VERSION_2_19
bool "eglibc 2.19" bool "eglibc 2.19"
select EGLIBC_VERSION_2_19 select EGLIBC_VERSION_2_19
@ -21,6 +16,6 @@ choice
endchoice endchoice
menu "eglibc configuration" 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 source toolchain/glibc/config/Config.in
endmenu endmenu

5
toolchain/glibc/Config.version
View File

@ -2,13 +2,9 @@ if USE_GLIBC
config GLIBC_VERSION config GLIBC_VERSION
string string
default "2.15" if EGLIBC_VERSION_2_15
default "2.19" if EGLIBC_VERSION_2_19 default "2.19" if EGLIBC_VERSION_2_19
default "2.21" if GLIBC_VERSION_2_21 default "2.21" if GLIBC_VERSION_2_21
config EGLIBC_VERSION_2_15
bool
config EGLIBC_VERSION_2_19 config EGLIBC_VERSION_2_19
default y if !TOOLCHAINOPTS default y if !TOOLCHAINOPTS
bool bool
@ -19,7 +15,6 @@ config GLIBC_VERSION_2_21
config GLIBC_REVISION config GLIBC_REVISION
string string
default "18909" if EGLIBC_VERSION_2_15
default "25243" if EGLIBC_VERSION_2_19 default "25243" if EGLIBC_VERSION_2_19
default "4e42b5b8f8" if GLIBC_VERSION_2_21 default "4e42b5b8f8" if GLIBC_VERSION_2_21
default "" default ""

9
toolchain/glibc/common.mk
View File

@ -17,12 +17,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
GLIBC_PATH:= 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),) ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
GLIBC_PATH:=libc/ GLIBC_PATH:=libc/
PKG_SOURCE_PROTO:=svn PKG_SOURCE_PROTO:=svn
@ -105,9 +99,6 @@ define Host/Prepare
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
ifeq ($(CONFIG_GLIBC_VERSION_2_21),) ifeq ($(CONFIG_GLIBC_VERSION_2_21),)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults $(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 endif
endef endef