all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob e6228e3264ac0f1538f4f9bf211b2a45c09b7963 2174 bytes (raw)
name: gnu/packages/patches/chez-scheme-bin-sh.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
 
From c170f0f3a326f293ee1f460a70303382966ca41b Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Thu, 19 May 2022 13:41:56 -0400
Subject: [PATCH] patch s_process for "/bin/sh" on Guix

This patch reuses the C preprocessor macro `GUIX_RKTIO_BIN_SH`
from a previous patch.

If:

    1. The `GUIX_RKTIO_BIN_SH` macro is defined; and

    2. The path specified by `GUIX_RKTIO_BIN_SH` exists;

then `s_process` will call `execl` with the file specified by
`GUIX_RKTIO_BIN_SH` instead of "/bin/sh".

This patch does not change the behavior of `s_system`, which relies
on `system` from the C library.
---
 c/prim5.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/c/prim5.c b/c/prim5.c
index 5a07893..926d68d 100644
--- a/c/prim5.c
+++ b/c/prim5.c
@@ -746,6 +746,22 @@ static ptr s_process(char *s, IBOOL stderrp) {
 
     INT tofds[2], fromfds[2], errfds[2];
     struct sigaction act, oint_act;
+    /* BEGIN PATCH for Guix */
+#if defined(GUIX_RKTIO_BIN_SH)
+# define GUIX_AS_a_STR_HELPER(x) #x
+# define GUIX_AS_a_STR(x) GUIX_AS_a_STR_HELPER(x)
+    /* A level of indirection makes `#` work as needed: */
+    struct stat guix_stat_buf;
+    char *guix_sh =
+      (0 == stat(GUIX_AS_a_STR(GUIX_RKTIO_BIN_SH), &guix_stat_buf))
+      ? GUIX_AS_a_STR(GUIX_RKTIO_BIN_SH)
+      : "/bin/sh";
+# undef GUIX_AS_a_STR
+# undef GUIX_AS_a_STR_HELPER
+#else /* GUIX_RKTIO_BIN_SH */
+    char *guix_sh = "/bin/sh";
+#endif
+    /* END PATCH for Guix */
 
     if (pipe(tofds)) S_error("process","cannot open pipes");
     if (pipe(fromfds)) {
@@ -771,7 +787,9 @@ static ptr s_process(char *s, IBOOL stderrp) {
         CLOSE(1); if (dup(fromfds[1]) != 1) _exit(1);
         CLOSE(2); if (dup(stderrp ? errfds[1] : 1) != 2) _exit(1);
         {INT i; for (i = 3; i < NOFILE; i++) (void)CLOSE(i);}
-        execl("/bin/sh", "/bin/sh", "-c", s, NULL);
+        /* BEGIN PATCH for Guix */
+        execl(guix_sh, guix_sh, "-c", s, NULL);
+        /* END PATCH for Guix */
         _exit(1) /* only if execl fails */;
         /*NOTREACHED*/
     } else {

base-commit: 9df56e7b25bc523663eac3da24be33afc5f76c84
-- 
2.32.0


debug log:

solving e6228e3264 ...
found e6228e3264 in https://yhetil.org/guix/5e5e8f491c7cbee3ef7a21437a52675dd47d186e.1659936550.git.philip@philipmcgrath.com/ ||
	https://yhetil.org/guix/86c1205b1144c03620cce866e7d22c67d1e9c47d.1660215295.git.philip@philipmcgrath.com/

applying [1/1] https://yhetil.org/guix/5e5e8f491c7cbee3ef7a21437a52675dd47d186e.1659936550.git.philip@philipmcgrath.com/
diff --git a/gnu/packages/patches/chez-scheme-bin-sh.patch b/gnu/packages/patches/chez-scheme-bin-sh.patch
new file mode 100644
index 0000000000..e6228e3264

1:35: trailing whitespace.
 
1:54: trailing whitespace.
 
1:70: trailing whitespace.
-- 
Checking patch gnu/packages/patches/chez-scheme-bin-sh.patch...
1:72: new blank line at EOF.
+
Applied patch gnu/packages/patches/chez-scheme-bin-sh.patch cleanly.
warning: 4 lines add whitespace errors.

skipping https://yhetil.org/guix/86c1205b1144c03620cce866e7d22c67d1e9c47d.1660215295.git.philip@philipmcgrath.com/ for e6228e3264
index at:
100644 e6228e3264ac0f1538f4f9bf211b2a45c09b7963	gnu/packages/patches/chez-scheme-bin-sh.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.