This is an automated email from the git hooks/post-receive script.
z572 pushed a commit to branch core-packages-team
in repository guix.
The following commit(s) were added to refs/heads/core-packages-team by this
push:
new 804ed633c0 fixup! DRAFT: gnu: glibc: update to 2.41.
804ed633c0 is described below
commit 804ed633c0b6d55429bd8fff531535fc31c0a49b
Author: Zheng Junjie <[email protected]>
AuthorDate: Sun Feb 9 10:17:20 2025 +0800
fixup! DRAFT: gnu: glibc: update to 2.41.
* gnu/packages/make-bootstrap.scm (glibc-for-bootstrap): Update it.
* gnu/packages/patches/glibc-2.39-bootstrap-system.patch: Rename to
glibc-2.41-bootstrap-system.patch and adjust it.
Change-Id: I51c12e3e8fa91dac340571e07a90d6220e0dc6ae
---
gnu/local.mk | 2 +-
gnu/packages/make-bootstrap.scm | 2 +-
...trap-system.patch => glibc-2.41-bootstrap-system.patch} | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 45583cf8e3..88b825e241 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1455,7 +1455,7 @@ dist_patch_DATA =
\
%D%/packages/patches/glibc-bootstrap-system-2.2.5.patch \
%D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \
%D%/packages/patches/glibc-bootstrap-system.patch \
- %D%/packages/patches/glibc-2.39-bootstrap-system.patch \
+ %D%/packages/patches/glibc-2.41-bootstrap-system.patch \
%D%/packages/patches/glibc-cross-objcopy.patch \
%D%/packages/patches/glibc-cross-objdump.patch \
%D%/packages/patches/glibc-dl-cache.patch \
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index c2a51f9b8b..03a5198946 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -75,7 +75,7 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(source (origin (inherit (package-source base))
(patches (append (search-patches
(match (package-version base)
- ("2.39"
"glibc-2.39-bootstrap-system.patch")
+ ("2.41"
"glibc-2.41-bootstrap-system.patch")
(_ "glibc-bootstrap-system.patch")))
(origin-patches (package-source base))))))
(arguments
diff --git a/gnu/packages/patches/glibc-2.39-bootstrap-system.patch
b/gnu/packages/patches/glibc-2.41-bootstrap-system.patch
similarity index 87%
rename from gnu/packages/patches/glibc-2.39-bootstrap-system.patch
rename to gnu/packages/patches/glibc-2.41-bootstrap-system.patch
index 5495b35948..cdaae7d92f 100644
--- a/gnu/packages/patches/glibc-2.39-bootstrap-system.patch
+++ b/gnu/packages/patches/glibc-2.41-bootstrap-system.patch
@@ -5,18 +5,18 @@ instead uses the hard-coded absolute file name of `bash'.
In addition, status should be initialized to 0 and not -1.
-Adapted to glibc-2.39.
+Adapted to glibc-2.41.
diff --git a/libio/iopopen.c b/libio/iopopen.c
index ebc381ed7c..e0d3ed1bc3 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
-@@ -85,8 +85,8 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp,
const char *command,
- return false;
+@@ -106,8 +106,8 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp,
const char *command,
+ }
}
-- err = __posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0,
-+ err = __posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0,
+- err = __posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, NULL,
++ err = __posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, NULL,
(char *const[]){ (char*) "sh", (char*) "-c", (char*)
"--",
(char *) command, NULL }, __environ);
if (err != 0)
@@ -38,8 +38,8 @@ index a03f478fc7..94da6facf3 100644
__posix_spawnattr_setflags (&spawn_attr,
POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK);
-- ret = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr,
-+ ret = __posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr,
+- ret = __posix_spawn (&pid, SHELL_PATH, NULL, &spawn_attr,
++ ret = __posix_spawnp (&pid, SHELL_NAME, NULL, &spawn_attr,
(char *const[]){ (char *) SHELL_NAME,
(char *) "-c",
(char *) line, NULL },
