[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd.
From: |
guix-commits |
Subject: |
29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd. |
Date: |
Fri, 1 May 2020 11:54:03 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 0cb52e9c98b59f2e4e3d708bc0b4b3b7a308acb5
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.
- 23/36: system: hurd: Export system variables., (continued)
- 23/36: system: hurd: Export system variables., guix-commits, 2020/05/01
- 06/36: HACK services: hurd: Add dummy syslog., guix-commits, 2020/05/01
- 11/36: DRAFT system: hurd: Add the Shepherd., guix-commits, 2020/05/01
- 18/36: system: hurd: Add guix., guix-commits, 2020/05/01
- 21/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/05/01
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01
- 36/36: HACK Don't fail on running host's localedef., guix-commits, 2020/05/01
- 28/36: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/01
- 29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd.,
guix-commits <=
- 34/36: WIP: gnu: services: Add %hurd-bare-metal-service., guix-commits, 2020/05/01
- 32/36: DRAFT system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/01
- 35/36: HACK system: vm: Add Hurd specifics., guix-commits, 2020/05/01
- 19/36: system: hurd: Add the guix service., guix-commits, 2020/05/01
- 26/36: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/01
- 27/36: system: Add hurd-operating-system-directory-base-entries., guix-commits, 2020/05/01
- 31/36: gnu: hurd: Switch system in RC., guix-commits, 2020/05/01
- 30/36: gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset., guix-commits, 2020/05/01
- 33/36: DRAFT: gnu: services: Use xprogram-file., guix-commits, 2020/05/01