diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-21 18:33:38 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-21 18:33:38 +0300 |
| commit | d08f5299e62ca8f5f36f4f6ddf3fcd739d157074 (patch) | |
| tree | 4ab882417f5fbf9ca25fda6ff74293d00039894e /gnu | |
| parent | dd36f508d57edc09b71f2316969dc14fee7df2c2 (diff) | |
| download | guix-d08f5299e62ca8f5f36f4f6ddf3fcd739d157074.tar.gz | |
gnu: glibc-for-bootstrap: Refresh patch.
This is a follow-up to d2a01e3b5b39f2665c3c50be452cea1ae06785af. * gnu/packages/patches/glibc-bootstrap-system.patch: Update for glibc-2.32.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/patches/glibc-bootstrap-system.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch index 39eb47ef26..f40833960f 100644 --- a/gnu/packages/patches/glibc-bootstrap-system.patch +++ b/gnu/packages/patches/glibc-bootstrap-system.patch @@ -3,17 +3,8 @@ and popen(3) need to be tweaked to use the right shell. For the bootstrap glibc, we just use whatever `sh' can be found in $PATH. The final glibc instead uses the hard-coded absolute file name of `bash'. ---- a/sysdeps/posix/system.c -+++ b/sysdeps/posix/system.c -@@ -140,7 +140,7 @@ do_system (const char *line) - __posix_spawnattr_setflags (&spawn_attr, - POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - -- status = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, -+ status = posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr, - (char *const[]){ (char*) SHELL_NAME, - (char*) "-c", - (char *) line, NULL }, +diff --git a/libio/iopopen.c b/libio/iopopen.c +index ebc381ed..e0d3ed1b 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command, @@ -25,4 +16,16 @@ instead uses the hard-coded absolute file name of `bash'. (char *const[]){ (char*) "sh", (char*) "-c", (char *) command, NULL }, __environ) != 0) return false; - +diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c +index a03f478f..9530404e 100644 +--- a/sysdeps/posix/system.c ++++ b/sysdeps/posix/system.c +@@ -145,7 +145,7 @@ do_system (const char *line) + __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, + (char *const[]){ (char *) SHELL_NAME, + (char *) "-c", + (char *) line, NULL }, |