[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/12: gnu: glibc/hurd-headers: Cross-build fix for the Hurd.
From: |
guix-commits |
Subject: |
01/12: gnu: glibc/hurd-headers: Cross-build fix for the Hurd. |
Date: |
Sun, 3 May 2020 17:13:37 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 1495312108aeb3f7ded437238b7aef964396f9cf
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 30 00:00:24 2020 +0200
gnu: glibc/hurd-headers: Cross-build fix for the Hurd.
* gnu/packages/base.scm (glibc/hurd-headers)[native-inputs]: Add mig; when
cross-building use 32-bit mig.
---
gnu/packages/base.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9899067..5ea129a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1274,6 +1274,15 @@ command.")
(outputs '("out"))
(propagated-inputs `(("gnumach-headers" ,gnumach-headers)
("hurd-headers" ,hurd-headers)))
+ (native-inputs
+ `(("mig" ,(if (%current-target-system)
+ ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
+ ;; hence this hack.
+ (package
+ (inherit mig)
+ (arguments `(#:system "i686-linux")))
+ mig))
+ ,@(package-native-inputs glibc)))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
;; We just pass the flags really needed to build the headers.
- branch wip-hurd-vm created (now 9b25e0e), guix-commits, 2020/05/03
- 04/12: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/03
- 01/12: gnu: glibc/hurd-headers: Cross-build fix for the Hurd.,
guix-commits <=
- 02/12: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/03
- 03/12: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/03
- 07/12: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/03
- 05/12: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/03
- 06/12: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/03
- 10/12: services: hurd: Add hurd-etc-sevcices., guix-commits, 2020/05/03
- 11/12: system: Add hurd activation., guix-commits, 2020/05/03
- 12/12: DRAFT services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/03
- 09/12: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/03
- 08/12: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/03