diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
| commit | 7353967690b425fd6519756979f3ef839b1a9cd1 (patch) | |
| tree | a910fd6b794556251fe607295c631aed98534235 /package/glibc | |
| parent | cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab (diff) | |
| parent | 1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a (diff) | |
| download | buildroot-7353967690b425fd6519756979f3ef839b1a9cd1.tar.gz buildroot-7353967690b425fd6519756979f3ef839b1a9cd1.zip | |
Merge branch 'next'
Quite some conflicts, so here goes ..
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Config.in | 14 | ||||
| -rw-r--r-- | package/glibc/glibc.hash | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in index f86822d18c..85aace6e29 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -12,15 +12,20 @@ choice config BR2_GLIBC_VERSION_2_22 bool "2.22" - # No support for pthread barriers on < v9 ISA - depends on !BR2_sparc # Too old to build with gcc >= 6.x depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_GLIBC_VERSION_2_23 bool "2.23" - # No support for pthread barriers on < v9 ISA - depends on !BR2_sparc + +config BR2_GLIBC_VERSION_2_24 + bool "2.24" + # Linux 3.2 or later kernel headers are required on all arches. + # See: https://sourceware.org/ml/libc-alpha/2016-08/msg00212.html + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + +comment "glibc-2.24 needs kernel headers >= 3.2" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 endchoice @@ -30,3 +35,4 @@ config BR2_GLIBC_VERSION_STRING string default "2.22" if BR2_GLIBC_VERSION_2_22 default "2.23" if BR2_GLIBC_VERSION_2_23 + default "2.24" if BR2_GLIBC_VERSION_2_24 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 052f281316..befe80c3c5 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,3 +1,4 @@ # Locally calculated after checking pgp signature (glibc) sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz sha256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 glibc-2.23.tar.xz +sha256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 glibc-2.24.tar.xz |
