ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-bootstrap: Adjust gawk patch to 4.1.3.

Browse source 
* gnu/packages/patches/gawk-shell.patch: Update for gawk 4.1.3.
This commit is contained in:
Ludovic Courtès 2015-06-09 21:38:00 +02:00
parent 30347caae7
commit e58652502b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/patches/gawk-shell.patch
View file

@ -2,9 +2,9 @@ As for libc's `system', change Awk to look for `sh' in $PATH. This patch is
only meant to be used during bootstrapping, where we don't know in advance the only meant to be used during bootstrapping, where we don't know in advance the
absolute file name of `sh'. absolute file name of `sh'.
--- gawk-4.0.0/io.c 2011-05-18 20:47:29.000000000 +0200 --- gawk-4.1.3/io.c 2015-05-19 15:37:20.000000000 +0200
+++ gawk-4.0.0/io.c 2012-12-18 15:56:06.000000000 +0100 +++ gawk-4.1.3/io.c 2015-06-09 18:39:36.918414881 +0200
@@ -1759,7 +1759,7 @@ two_way_open(const char *str, struct red @@ -1945,7 +1945,7 @@ two_way_open(const char *str, struct red
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
@ -13,22 +13,22 @@ absolute file name of `sh'.
_exit(errno == ENOENT ? 127 : 126); _exit(errno == ENOENT ? 127 : 126);
case -1: case -1:
@@ -1924,7 +1924,7 @@ use_pipes: @@ -2129,7 +2129,7 @@ use_pipes:
|| close(ctop[0]) == -1 || close(ctop[1]) == -1)
fatal(_("close of pipe failed (%s)"), strerror(errno)); fatal(_("close of pipe failed (%s)"), strerror(errno));
/* stderr does NOT get dup'ed onto child's stdout */ /* stderr does NOT get dup'ed onto child's stdout */
signal(SIGPIPE, SIG_DFL);
- execl("/bin/sh", "sh", "-c", str, NULL); - execl("/bin/sh", "sh", "-c", str, NULL);
+ execlp("sh", "sh", "-c", str, NULL); + execlp("sh", "sh", "-c", str, NULL);
_exit(errno == ENOENT ? 127 : 126); _exit(errno == ENOENT ? 127 : 126);
} }
#endif /* NOT __EMX__ */ #endif /* NOT __EMX__, NOT __MINGW32__ */
@@ -2074,7 +2074,7 @@ gawk_popen(const char *cmd, struct redir @@ -2323,7 +2323,7 @@ gawk_popen(const char *cmd, struct redir
fatal(_("moving pipe to stdout in child failed (dup: %s)"), strerror(errno));
if (close(p[0]) == -1 || close(p[1]) == -1) if (close(p[0]) == -1 || close(p[1]) == -1)
fatal(_("close of pipe failed (%s)"), strerror(errno)); fatal(_("close of pipe failed (%s)"), strerror(errno));
signal(SIGPIPE, SIG_DFL);
- execl("/bin/sh", "sh", "-c", cmd, NULL); - execl("/bin/sh", "sh", "-c", cmd, NULL);
+ execlp("sh", "sh", "-c", cmd, NULL); + execlp("sh", "sh", "-c", cmd, NULL);
_exit(errno == ENOENT ? 127 : 126); _exit(errno == ENOENT ? 127 : 126);
} }
#endif /* NOT __EMX__ */ #endif /* NOT __EMX__, NOT __MINGW32__ */