amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co.

Browse source 
* gnu/packages/commencement.scm (glibc-mesboot0): Use Gash instead of
coretutils&co.
This commit is contained in:
Jan Nieuwenhuizen 2019-10-06 21:19:35 +02:00
parent 562c6e3c52
commit f6b911fb5f
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 95 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/patches/glibc-bootstrap-system-2.2.5.patch Normal file
View file

@ -0,0 +1,30 @@
We want to allow builds in chroots that lack /bin/sh. Thus, system(3)
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
@@ -106,8 +106,8 @@ do_system (const char *line)
(void) UNBLOCK;
/* Exec the shell. */
- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ);
+ (void) execvp (SHELL_NAME, (char *const *) new_argv);
_exit (127);
}
else if (pid < (pid_t) 0)
/* The fork failed. */
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -170,7 +170,7 @@ _IO_new_proc_open (fp, command, mode)
for (p = proc_file_chain; p; p = p->next)
_IO_close (_IO_fileno ((_IO_FILE *) p));
- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
+ execlp ("sh", "sh", "-c", command, (char *) 0);
_IO__exit (127);
}
_IO_close (child_end);