diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2019-09-30 18:57:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2019-09-30 19:14:24 +0200 |
| commit | aac679b676bb493872aa46d3a9ddcadbfe524562 (patch) | |
| tree | 6578630e5851d6d2accb8bee8737a4b4a95f4e70 | |
| parent | ead26e764920651c96370458a626a954e2997914 (diff) | |
glibc: update to 2.30
| -rw-r--r-- | target/config/Config.in.libc | 12 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 17 |
2 files changed, 9 insertions, 20 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index d9ce17c6b..b41e79ecb 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -150,17 +150,13 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL -config ADK_TARGET_LIB_GLIBC_2_28 - bool "2.28" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY - -config ADK_TARGET_LIB_GLIBC_CSKY - bool "csky" - depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_CSKY +config ADK_TARGET_LIB_GLIBC_2_30 + bool "2.30" + depends on ADK_TARGET_LIB_GLIBC config ADK_TARGET_LIB_GLIBC_GIT bool "git" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY && ADK_EXPERIMENTAL + depends on ADK_TARGET_LIB_GLIBC && ADK_EXPERIMENTAL config ADK_TARGET_LIB_MUSL_1_1_20 bool "1.1.20" diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 5733f7956..0fef6a892 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -3,23 +3,16 @@ PKG_NAME:= glibc ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 2.28.90 -PKG_GLIBCVER:= 2.28.9000 +PKG_VERSION:= 2.30.90 +PKG_GLIBCVER:= 2.30.9000 PKG_SITES:= git://sourceware.org/git/glibc.git PKG_RELEASE:= 1 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_28),y) -PKG_VERSION:= 2.28 -PKG_GLIBCVER:= 2.28 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_30),y) +PKG_VERSION:= 2.30 +PKG_GLIBCVER:= 2.30 PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_HASH:= b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y) -PKG_VERSION:= master -PKG_GLIBCVER:= 2.25 -PKG_GIT:= branch -PKG_SITES:= https://github.com/c-sky/glibc.git -PKG_RELEASE:= 1 -endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |