diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/glibc/Config.in | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
| download | buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.tar.gz buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/glibc/Config.in')
| -rw-r--r-- | package/glibc/Config.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 8cc8ccef3c..72fd3dfff1 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -32,17 +32,15 @@ config BR2_PACKAGE_GLIBC choice prompt "glibc version" - default BR2_GLIBC_VERSION_2_20 - -config BR2_GLIBC_VERSION_2_20 - depends on !BR2_nios2 - # Broken see https://bugs.busybox.net/show_bug.cgi?id=7941 - depends on !BR2_sparc - bool "2.20" + default BR2_GLIBC_VERSION_2_21 config BR2_GLIBC_VERSION_2_21 bool "2.21" +config BR2_GLIBC_VERSION_2_22 + bool "2.22" + depends on !BR2_sparc # broken + endchoice endif @@ -51,5 +49,5 @@ 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.20" if BR2_GLIBC_VERSION_2_20 default "2.21" if BR2_GLIBC_VERSION_2_21 + default "2.22" if BR2_GLIBC_VERSION_2_22 |
