summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/config/Config.in.libc.choice5
-rw-r--r--target/config/Config.in.libc.default2
-rw-r--r--toolchain/glibc/Makefile.inc11
3 files changed, 15 insertions, 3 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 609ab5cdb..31a626664 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -72,6 +72,11 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
select ADK_DISABLE_CHECKSUM
depends on ADK_TARGET_LIB_UCLIBC_NG
+config ADK_TARGET_LIB_GLIBC_2_20
+ prompt "2.20"
+ boolean
+ depends on ADK_TARGET_LIB_GLIBC
+
config ADK_TARGET_LIB_GLIBC_2_19
prompt "2.19"
boolean
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index f0daedd2d..04c6b4204 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -24,7 +24,7 @@ config ADK_LIBC_VERSION
string
default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
- default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
+ default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
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 5b0677c9b..68607e954 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -5,12 +5,19 @@ PKG_NAME:= glibc
ifeq ($(ADK_LIBC_VERSION),git)
PKG_VERSION:= 2.19.90
PKG_REPO:= git://sourceware.org/git/glibc.git
-else
-PKG_VERSION:= $(ADK_LIBC_VERSION)
+endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y)
+PKG_VERSION:= 2.20
PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 948a6e06419a01bd51e97206861595b0
endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_19),y)
+PKG_VERSION:= 2.19
+PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
PKG_RELEASE:= 1
PKG_MD5SUM:= e26b8cc666b162f999404b03970f14e4
+endif
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--host=$(GNU_TARGET_NAME) \