Merge branch 'next'

[coffee/buildroot.git] / package / glibc / Config.in

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index f719d5cd1b13ee0b8681b2ea01bdcf70fe717627..02cae3523c5ab4cdc2023abf2073f75cbd9fed4e 100644 (file)
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -1,28 +1,3 @@
-if BR2_TOOLCHAIN_BUILDROOT_EGLIBC
-
-config BR2_PACKAGE_EGLIBC
-       bool
-       default y
-       select BR2_PACKAGE_LINUX_HEADERS
-
-choice
-       prompt "eglibc version"
-       default BR2_EGLIBC_VERSION_2_18
-
-config BR2_EGLIBC_VERSION_2_18
-       bool "2.18-svnr23787"
-       # Build breakage
-       depends on !BR2_sparc
-
-config BR2_EGLIBC_VERSION_2_19
-       bool "2.19-svnr25243"
-       # Build breakage
-       depends on !BR2_powerpc_SPE
-
-endchoice
-
-endif
-
 if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 config BR2_PACKAGE_GLIBC
@@ -53,7 +28,5 @@ endif
 
 config BR2_GLIBC_VERSION_STRING
        string
-       default "2.18-svnr23787" if BR2_EGLIBC_VERSION_2_18
-       default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19
        default "2.22" if BR2_GLIBC_VERSION_2_22
        default "2.23" if BR2_GLIBC_VERSION_2_23