summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-08-07 17:51:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-08-07 17:51:25 +0200
commitb8b732722f8ee75ddb004f588af88bbe7e63c5c1 (patch)
treec147cf134945088f6f73ae44c6664c4d1a1f67a9
parentc6a72670b54e13d3ab3a6056d7c4f4c503cf0d78 (diff)
update glibc to 2.22
-rw-r--r--target/config/Config.in.libc.choice4
-rw-r--r--target/config/Config.in.libc.default1
-rw-r--r--toolchain/glibc/Makefile.inc6
3 files changed, 11 insertions, 0 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 0973eb158..e9bc840fd 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -77,6 +77,10 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
bool "git"
depends on ADK_TARGET_LIB_UCLIBC_NG
+config ADK_TARGET_LIB_GLIBC_2_22
+ bool "2.22"
+ depends on ADK_TARGET_LIB_GLIBC
+
config ADK_TARGET_LIB_GLIBC_2_21
bool "2.21"
depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_X86_64
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index 6e95f9c9d..a217d7bd9 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -28,6 +28,7 @@ config ADK_LIBC_VERSION
default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
+ default "2.22" if ADK_TARGET_LIB_GLIBC_2_22
default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
ADK_TARGET_LIB_UCLIBC_GIT || \
ADK_TARGET_LIB_MUSL_GIT || \
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 9232d8a45..2d5ae7a2a 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -6,6 +6,12 @@ ifeq ($(ADK_LIBC_VERSION),git)
PKG_VERSION:= 2.21.90
PKG_SITES:= git://sourceware.org/git/glibc.git
endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_22),y)
+PKG_VERSION:= 2.22
+PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
+PKG_RELEASE:= 1
+PKG_HASH:= eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948
+endif
ifeq ($(ADK_TARGET_LIB_GLIBC_2_21),y)
PKG_VERSION:= 2.21
PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}