diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -152,7 +152,7 @@ #:key (base-gcc-for-libc base-gcc) (base-kernel-headers base-linux-kernel-headers) - (base-libc (hardened-glibc (make-glibc-without-werror glibc-2.27))) + (base-libc (hardened-glibc (make-glibc-without-werror glibc-2.28))) (base-gcc (make-gcc-rpath-link (hardened-gcc base-gcc)))) "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values desirable for building Bitcoin ABC release binaries." @@ -549,23 +549,23 @@ "--enable-stack-protector" "all") "--enable-bind-now" "yes")) -(define-public glibc-2.27 +(define-public glibc-2.28 (package (inherit glibc-2.31) - (version "2.27") + (version "2.28") (source (origin (method git-fetch) (uri (git-reference (url "https://sourceware.org/git/glibc.git") - (commit "73886db6218e613bd6d4edf529f11e008a6c2fa6"))) - (file-name (git-file-name "glibc" "73886db6218e613bd6d4edf529f11e008a6c2fa6")) + (commit "c9e58ae23402eb82877de90fd8a18519c086ed87"))) + (file-name (git-file-name "glibc" "c9e58ae23402eb82877de90fd8a18519c086ed87")) (sha256 (base32 - "0azpb9cvnbv25zg8019rqz48h8i2257ngyjg566dlnp74ivrs9vq")) + "0wm0if2n4z48kpn85va6yb4iac34crds2f55ddpz1hykx6jp1pb6")) (patches (search-our-patches "glibc-ldd-x86_64.patch" "glibc-versioned-locpath.patch" - "glibc-2.27-fcommon.patch" - "glibc-2.27-guix-prefix.patch")))))) + "glibc-2.28-fcommon.patch" + "glibc-2.28-guix-prefix.patch")))))) (packages->manifest (append diff --git a/contrib/guix/patches/glibc-2.27-fcommon.patch b/contrib/guix/patches/glibc-2.28-fcommon.patch rename from contrib/guix/patches/glibc-2.27-fcommon.patch rename to contrib/guix/patches/glibc-2.28-fcommon.patch --- a/contrib/guix/patches/glibc-2.27-fcommon.patch +++ b/contrib/guix/patches/glibc-2.28-fcommon.patch @@ -21,7 +21,7 @@ index 86a71e5802..aa2166be60 100644 --- a/Makeconfig +++ b/Makeconfig -@@ -896,7 +896,7 @@ ifeq "$(strip $(+cflags))" "" +@@ -901,7 +901,7 @@ ifeq "$(strip $(+cflags))" "" endif # $(+cflags) == "" +cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants) $(+math-flags) \ diff --git a/contrib/guix/patches/glibc-2.27-guix-prefix.patch b/contrib/guix/patches/glibc-2.28-guix-prefix.patch rename from contrib/guix/patches/glibc-2.27-guix-prefix.patch rename to contrib/guix/patches/glibc-2.28-guix-prefix.patch --- a/contrib/guix/patches/glibc-2.27-guix-prefix.patch +++ b/contrib/guix/patches/glibc-2.28-guix-prefix.patch @@ -9,7 +9,7 @@ --- a/Makeconfig +++ b/Makeconfig -@@ -992,6 +992,10 @@ object-suffixes := +@@ -998,6 +998,10 @@ object-suffixes := CPPFLAGS-.o = $(pic-default) # libc.a must be compiled with -fPIE/-fpie for static PIE. CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) $(pie-default) diff --git a/contrib/guix/patches/glibc-versioned-locpath.patch b/contrib/guix/patches/glibc-versioned-locpath.patch --- a/contrib/guix/patches/glibc-versioned-locpath.patch +++ b/contrib/guix/patches/glibc-versioned-locpath.patch @@ -143,10 +143,10 @@ if (category == LC_ALL) diff --git a/string/Makefile b/string/Makefile -index 8424a61..f925503 100644 +index aa2da9ca72..f273c2611d 100644 --- a/string/Makefile +++ b/string/Makefile -@@ -38,7 +38,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ +@@ -40,7 +40,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ swab strfry memfrob memmem rawmemchr strchrnul \ $(addprefix argz-,append count create ctsep next \ delete extract insert stringify \ @@ -218,10 +218,10 @@ +} +weak_alias (__argz_suffix_entries, argz_suffix_entries) diff --git a/string/argz.h b/string/argz.h -index bb62a31..d276a35 100644 +index 9c496f5ef5..1010a439d8 100644 --- a/string/argz.h +++ b/string/argz.h -@@ -134,6 +134,16 @@ extern error_t argz_replace (char **__restrict __argz, +@@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz, const char *__restrict __str, const char *__restrict __with, unsigned int *__restrict __replace_count);