[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates 11/15] gnumach, hurd: Switch to using cr
From: |
Josselin Poiret |
Subject: |
[bug#62307] [PATCH core-updates 11/15] gnumach, hurd: Switch to using cross-mig. |
Date: |
Mon, 20 Mar 2023 23:10:47 +0100 |
* gnu/packages/hurd.scm (gnumach, hurd): Switch to cross-mig when
cross-building.
---
gnu/packages/hurd.scm | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 2a823f6576..be5eb25fee 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -313,7 +313,15 @@ (define-public gnumach
(invoke "make" "gnumach.gz")
(install-file "gnumach.gz" boot))))))))
(native-inputs
- (list mig perl autoconf automake texinfo-4))
+ (list autoconf
+ automake
+ (if (%current-target-system)
+ (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
+ (cross-mig (module-ref cross-base 'cross-mig)))
+ (cross-mig (%current-target-system)))
+ mig)
+ perl
+ texinfo-4))
(supported-systems (cons "i686-linux" %hurd-systems))
(synopsis "Microkernel of the GNU system")
(description
@@ -533,12 +541,12 @@ (define-public hurd
`(("autoconf" ,autoconf)
("automake" ,automake)
("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config'
- ("pkg-config" ,pkg-config)
("mig" ,(if (%current-target-system)
- ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
- ;; hence this hack.
- mig/32-bit
+ (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
+ (cross-mig (module-ref cross-base 'cross-mig)))
+ (cross-mig (%current-target-system)))
mig))
+ ("pkg-config" ,pkg-config)
("perl" ,perl)
("texinfo" ,texinfo-4)
("dde-sources" ,dde-sources)))
--
2.39.2
- [bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., (continued)
- [bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 10/15] hurd: Remove useless glibc/hurd-headers input., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 13/15] mig/32-bit: Remove., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 05/15] cross-base: Add cross arguments to hurd derivatives., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 08/15] gnumach: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 11/15] gnumach, hurd-headers, hurd: Switch to using cross-mig., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 11/15] gnumach, hurd: Switch to using cross-mig.,
Josselin Poiret <=
- [bug#62307] [PATCH core-updates 09/15] hurd: Update to 91a51672ff4cfe1f1a0712b4c542ded3081c825b., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 14/15] system: hurd: Use shepherd-0.8 in the package list., Josselin Poiret, 2023/03/20