mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-17 20:27:36 -05:00
db2c7e70ad
This commit bootstraps the Racket compiler and runtime system from source,
including Racket CS as well as both variants of Racket BC. (One remaining
limitation is discussed in comments added to gnu/packages/racket.scm.)
In the process, it moves to building minimal Racket from the Git repository,
rather than the packaged source tarballs. The Git repository is slightly
better as the ``corresponding source'':
1. A few packages especially closely tied to the Racket core implementation
(like "compiler-lib", "base", and "racket-doc") are developed in the
same Git repository. Having them use the same Guix origin, too, will
help to keep them in sync.
2. The top-level Makefile in the Git repository is an important
``script[] used to control compilation and installation.''
In particular, it cooperates with the "distro-build" package to
create the source tarballs and installers for a Racket distribution.
(Racket supports a notion of custom distributions.)
3. It is ``the preferred form ... for making modifications'' to the core
Racket implementation.
Racket releases are tagged in the Git repository (e.g. "v8.1"). At the
beginning of each release cycle, a branch is created to stabilizer a version
for extra testing. Active development happens on the "master" branch.
* gnu/packages/racket-minimal-sh-via-rktio.patch: Adjust for extra directory
layer.
* gnu/local/racket.scm (cfg-flag:sh-for-rktio, cfg-flag:enable-lt,
cfg-flag:enable-racket, unpack-nanopass+stex,
%main-repo-main-distribution-pkgs): New private variables.
* gnu/local/racket.scm (racket-minimal)[source]: Use Git.
[source](snippet): Unbundle nanopass, stex, and libffi.
[native-inputs]: Use racket-bootstrap-chez-bootfiles, plus its
dependencies (for Chez, plus a Racket for bootstrap pig).
[arguments]: Revise extensively.
* gnu/local/racket.scm (racket-minimal-bc-3m, racket-minimal-bc-cgc): New
packages, hidden at least for now.
(racket-bootstrap-chez-bootfiles): Another new package, but this one is
especially likely to stay hidden.
* gnu/local/racket.scm (racket)[origin](snippet): Unbundle packages
developed in the main Git repository, but leave their links.rktd and
pkgs.rktd entries in place.
[native-inputs]: Add the main Racket Git repository.
[arguments](#:phases): Adjust 'unpack-packages to also unpack package
sources from the main Racket Git repository.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
87 lines
3.5 KiB
Diff
87 lines
3.5 KiB
Diff
From 3574b567c486d264d680a37586436c3b5a8cb978 Mon Sep 17 00:00:00 2001
|
|
From: Philip McGrath <philip@philipmcgrath.com>
|
|
Date: Thu, 4 Mar 2021 04:11:50 -0500
|
|
Subject: [PATCH] patch rktio_process for "/bin/sh" on Guix
|
|
|
|
Racket provides the functions `system` and `process`,
|
|
which execute shell commands using `sh` (or `cmd` on Windows).
|
|
Racket assumes that `sh` can be found at "/bin/sh",
|
|
which is not necessarily true on Guix.
|
|
|
|
This patch adds a special case for "/bin/sh" to `rktio_process`,
|
|
the C function that implements the core of `system`, `process`,
|
|
and related Racket functions.
|
|
|
|
Guix should enable the special case by defining the C preprocessor
|
|
macro `GUIX_RKTIO_PATCH_BIN_SH` with the path to `sh` in the store.
|
|
If:
|
|
|
|
1. The `GUIX_RKTIO_PATCH_BIN_SH` macro is defined; and
|
|
|
|
2. `rktio_process` is called with the exact path "/bin/sh"; and
|
|
|
|
3. The path specified by `GUIX_RKTIO_PATCH_BIN_SH` does exists;
|
|
|
|
then `rktio_process` will execute the file specified
|
|
by `GUIX_RKTIO_PATCH_BIN_SH` instead of "/bin/sh".
|
|
|
|
Compared to previous attempts to patch the Racket sources,
|
|
making this change at the C level is both:
|
|
|
|
- More comprehensive: it catches all attempts to execute "/bin/sh",
|
|
without having to track down the source of every occurance; and
|
|
|
|
- Less intrusive: by guarding the special case with a C preprocessor
|
|
conditional and a runtime check that the file in the store exists,
|
|
we make it much less likely that it will "leak" out of Guix.
|
|
---
|
|
racket/src/rktio/rktio_process.c | 21 ++++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/racket/src/rktio/rktio_process.c b/racket/src/rktio/rktio_process.c
|
|
index 89202436c0..465ebdd5c5 100644
|
|
--- a/racket/src/rktio/rktio_process.c
|
|
+++ b/racket/src/rktio/rktio_process.c
|
|
@@ -1224,12 +1224,14 @@ int rktio_process_allowed_flags(rktio_t *rktio)
|
|
/*========================================================================*/
|
|
|
|
rktio_process_result_t *rktio_process(rktio_t *rktio,
|
|
- const char *command, int argc, rktio_const_string_t *argv,
|
|
+ /* PATCHED for Guix (next line) */
|
|
+ const char *_guix_orig_command, int argc, rktio_const_string_t *argv,
|
|
rktio_fd_t *stdout_fd, rktio_fd_t *stdin_fd, rktio_fd_t *stderr_fd,
|
|
rktio_process_t *group_proc,
|
|
const char *current_directory, rktio_envvars_t *envvars,
|
|
int flags)
|
|
{
|
|
+ const char *command; /* PATCHED for Guix */
|
|
rktio_process_result_t *result;
|
|
intptr_t to_subprocess[2], from_subprocess[2], err_subprocess[2];
|
|
int pid;
|
|
@@ -1255,6 +1257,23 @@ rktio_process_result_t *rktio_process(rktio_t *rktio,
|
|
int i;
|
|
#endif
|
|
|
|
+/* BEGIN PATCH for Guix */
|
|
+#if defined(GUIX_RKTIO_PATCH_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: */
|
|
+ command =
|
|
+ ((0 == strcmp(_guix_orig_command, "/bin/sh"))
|
|
+ && rktio_file_exists(rktio, GUIX_AS_a_STR(GUIX_RKTIO_PATCH_BIN_SH)))
|
|
+ ? GUIX_AS_a_STR(GUIX_RKTIO_PATCH_BIN_SH)
|
|
+ : _guix_orig_command;
|
|
+# undef GUIX_AS_a_STR
|
|
+# undef GUIX_AS_a_STR_HELPER
|
|
+#else
|
|
+ command = _guix_orig_command;
|
|
+#endif
|
|
+/* END PATCH for Guix */
|
|
+
|
|
/* avoid compiler warnings: */
|
|
to_subprocess[0] = -1;
|
|
to_subprocess[1] = -1;
|
|
--
|
|
2.21.1 (Apple Git-122.3)
|
|
|