[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/62: system: hurd: Ensure propagated inputs are also cross-built.
From: |
guix-commits |
Subject: |
47/62: system: hurd: Ensure propagated inputs are also cross-built. |
Date: |
Sat, 11 Apr 2020 11:35:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 6b9723b3e0834993a2905693b91b9683d974b3ba
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Apr 8 23:23:06 2020 +0200
system: hurd: Ensure propagated inputs are also cross-built.
Previously, the propagated inputs of 'guix' would be the native
GNU/Linux packages.
* gnu/system/hurd.scm (cross-hurd-image)[cross-built]
[cross-built-entry]: New procedures.
[system-profile, grub.cfg]: Use it.
---
gnu/system/hurd.scm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index fd0a602..65b8c07 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -60,18 +60,23 @@
(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach))
"Return a cross-built GNU/Hurd image."
+ (define (cross-built thing)
+ (with-parameters ((%current-target-system "i586-pc-gnu"))
+ thing))
+
+ (define (cross-built-entry entry)
+ (manifest-entry
+ (inherit entry)
+ (item (cross-built (manifest-entry-item entry)))
+ (dependencies (map cross-built-entry
+ (manifest-entry-dependencies entry)))))
+
(define system-profile
- (map-manifest-entries
- (lambda (entry)
- (manifest-entry
- (inherit entry)
- (item (with-parameters ((%current-target-system "i586-pc-gnu"))
- (manifest-entry-item entry)))))
- (packages->manifest %base-packages/hurd)))
+ (map-manifest-entries cross-built-entry
+ (packages->manifest %base-packages/hurd)))
(define grub.cfg
- (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu"))
- hurd))
+ (let ((hurd (cross-built hurd))
(mach (with-parameters ((%current-system "i686-linux"))
gnumach))
(libc (cross-libc "i586-pc-gnu")))
- 34/62: gnu: hurd: Add dependency on libgcrypt., (continued)
- 34/62: gnu: hurd: Add dependency on libgcrypt., guix-commits, 2020/04/11
- 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 <=
- 51/62: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/11
- 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