Fix , which affects GNU/Hurd. diff --git a/libguile/posix.c b/libguile/posix.c index 3a8be94e4..f5fdc544c 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -1326,7 +1326,14 @@ static void close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) { while (--max_fd > 2) - posix_spawn_file_actions_addclose (actions, max_fd); + { + /* Adding invalid file descriptors to an 'addclose' action leads + to 'posix_spawn' failures on some operating systems: + . Hence the extra check. */ + int flags = fcntl (max_fd, F_GETFD, NULL); + if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) + posix_spawn_file_actions_addclose (actions, max_fd); + } } static void Fix . diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test index f20e04453..d5cf47cda 100644 --- a/test-suite/tests/posix.test +++ b/test-suite/tests/posix.test @@ -431,7 +431,13 @@ (let ((str (get-string-all (car input+output)))) (close-port (car input+output)) (waitpid pid) - str))) + + ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for + ;; every program: . Strip it. + (if (and (string=? "GNU" (utsname:sysname (uname))) + (string-prefix? "LD_ORIGIN_PATH=" str)) + (string-drop str (+ 1 (string-index str #\newline))) + str)))) (pass-if-equal "ls /proc/self/fd" "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd author'>author
path: root/m4
AgeCommit message (Expand)Author
2024-12-12build: Fix detection of guile-ssh....Fixes <https://issues.guix.gnu.org/74800>. The check for make-session stopped working after update to 0.18.0. This commit adds the additional `#:config #f' to skip reading the ssh configuration, arguably we did not want to do that anyway. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Add `#:config #f' to make-session call. Change-Id: Id6ea3860292159ac2e6cf2a77df5f720f66aa071 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Reported-by: Dariqq <dariqq@posteo.net> Tomas Volf
2024-12-03gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd....On commit: ec8a5ec15f898e864705e5a5c834532e3fa8d0a4 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 Janneke Nieuwenhuizen