summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/elfutils/Makefile2
-rw-r--r--target/config/Config.in.binutils1
-rw-r--r--target/config/Config.in.libc6
-rw-r--r--toolchain/glibc/Makefile.inc12
4 files changed, 11 insertions, 10 deletions
diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile
index 231559424..e4f1d49a9 100644
--- a/package/elfutils/Makefile
+++ b/package/elfutils/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8
PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf)
PKG_SECTION:= base/libs
+PKG_DEPENDS:= zlib
+PKG_BUILDDEP:= zlib
PKG_NEEDS:= intl
PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 6ed262f58..0beb783f7 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -10,7 +10,6 @@ default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX
default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC
default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2
-default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64
default ADK_TOOLCHAIN_BINUTILS_2_45
config ADK_TOOLCHAIN_BINUTILS_GIT
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 7129cf934..8b942b372 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -156,8 +156,8 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
bool "git"
depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL
-config ADK_TARGET_LIB_GLIBC_2_41
- bool "2.41"
+config ADK_TARGET_LIB_GLIBC_2_42
+ bool "2.42"
depends on ADK_TARGET_LIB_GLIBC
config ADK_TARGET_LIB_GLIBC_GIT
@@ -200,7 +200,7 @@ config ADK_LIBC_VERSION
string
default "1.0.54" if ADK_TARGET_LIB_UCLIBC_NG_1_0_54
default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5
- default "2.41" if ADK_TARGET_LIB_GLIBC_2_40
+ default "2.42" if ADK_TARGET_LIB_GLIBC_2_42
default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0
default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
ADK_TARGET_LIB_MUSL_GIT || \
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 4f35b1e94..b2c16fdb1 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -3,16 +3,16 @@
PKG_NAME:= glibc
ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:= 2.41.90
-PKG_GLIBCVER:= 2.41.9000
+PKG_VERSION:= 2.42.90
+PKG_GLIBCVER:= 2.42.9000
PKG_SITES:= https://sourceware.org/git/glibc.git
PKG_RELEASE:= 1
endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_41),y)
-PKG_VERSION:= 2.41
-PKG_GLIBCVER:= 2.41
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_42),y)
+PKG_VERSION:= 2.42
+PKG_GLIBCVER:= 2.42
PKG_RELEASE:= 1
PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
-PKG_HASH:= c7be6e25eeaf4b956f5d4d56a04d23e4db453fc07760f872903bb61a49519b80
+PKG_HASH:= d4468d3e3267068c1b0623ca6424aac9a28766df774c8d8fb4978127fca7125a
endif
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz