[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
51/62: gnu: guix: Cross-build fixup for wrap-program.
From: |
guix-commits |
Subject: |
51/62: gnu: guix: Cross-build fixup for wrap-program. |
Date: |
Sat, 11 Apr 2020 11:35:56 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit ad6e151420a119446691c9722f9ab086de11e503
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Wed Apr 8 09:43:51 2020 +0200
gnu: guix: Cross-build fixup for wrap-program.
This allows running:
guix build hello
* gnu/packages/package-management.scm (guix)[arguments]: When
cross-compiling,
add 'wrap-program:substitute-host-bash phase to fixup the shebang generated
by
wrap-program.
[inputs]: When cross-compiling, include bash-minimal.
---
gnu/packages/package-management.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 2e46d05..5507591 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -37,6 +37,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
@@ -192,6 +193,14 @@ $(prefix)/etc/init.d\n")))
(string-append "LANGUAGE= PATH="
self "/bin"
":" (getenv "PATH"))))
+ #t)))
+ ;; XXX Touching wrap-program rebuilds world
+ (add-after 'wrap-program
'wrap-program:substitute-host-bash
+ (lambda* (#:key inputs outputs
#:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (bash (assoc-ref inputs "bash")))
+ (substitute* (string-append out "/bin/guix")
+ (("^#!.*/bash") (string-append "#! " bash
"/bin/bash")))
#t))))
'())
(add-before 'check 'copy-bootstrap-guile
@@ -357,6 +366,9 @@ $(prefix)/etc/init.d\n")))
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())
+ ,@(if (%current-target-system)
+ `(("bash" ,bash-minimal))
+ '())
;; Tests also rely on these bootstrap executables.
("bootstrap/bash" ,(bootstrap-executable "bash" target))
- 35/62: gnu: hurd: Add dependency on libdaemon., (continued)
- 35/62: gnu: hurd: Add dependency on libdaemon., guix-commits, 2020/04/11
- 39/62: gnu: guile-json: Cross-build fix., guix-commits, 2020/04/11
- 62/62: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/11
- 22/62: system: hurd: Create /etc/{hostname,motd,login} and /root., guix-commits, 2020/04/11
- 30/62: vm: Make the device node procedure a parameter., guix-commits, 2020/04/11
- 32/62: system: hurd: Add guix., guix-commits, 2020/04/11
- 38/62: system: hurd: Add openssh, shepherd., guix-commits, 2020/04/11
- 36/62: gnu: hurd: Install a BDF font., guix-commits, 2020/04/11
- 46/62: system: hurd: Add guile-candy., guix-commits, 2020/04/11
- 47/62: system: hurd: Ensure propagated inputs are also cross-built., guix-commits, 2020/04/11
- 51/62: gnu: guix: Cross-build fixup for wrap-program.,
guix-commits <=
- 52/62: gnu: guix: Add dependency on `hurd' when building for the Hurd., guix-commits, 2020/04/11
- 50/62: gnu: Fix typo., guix-commits, 2020/04/11
- 58/62: HACK build.sh, 2GiB disk., guix-commits, 2020/04/11
- 59/62: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/11
- 24/62: vm: Preserve file permissions on /dev., guix-commits, 2020/04/11
- 29/62: linux-boot: Add 'make-hurd-device-nodes'., guix-commits, 2020/04/11
- 31/62: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/11
- 37/62: gnu: openssh: Build fix for the Hurd., guix-commits, 2020/04/11
- 33/62: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/11
- 43/62: gnu: hurd: "/libexec/rc" spawns the console client., guix-commits, 2020/04/11