[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/21: gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig.
From: |
guix-commits |
Subject: |
11/21: gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig. |
Date: |
Thu, 30 Mar 2023 06:47:01 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit d509aab2304c7ed8cd730ac97268d2b3a807fadf
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Mon Mar 20 23:10:46 2023 +0100
gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig.
* gnu/packages/hurd.scm (gnumach, hurd-headers, hurd): Switch to cross-mig
when
cross-building.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/hurd.scm | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index cc7d3d77a9..80fa061175 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -185,7 +185,13 @@ communication.")
"hurd-fix-types-of-read-write-and-readables-methods-2.patch"))))
(build-system gnu-build-system)
(native-inputs
- (list autoconf automake mig))
+ (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)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -309,7 +315,15 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
(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
@@ -529,12 +543,12 @@ exec ${system}/rc \"$@\"
`(("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)))
- branch core-updates updated (d9dc32b871 -> 35b208cb22), guix-commits, 2023/03/30
- 01/21: gnu: glibc: Work around broken GNU Mach header detection., guix-commits, 2023/03/30
- 06/21: gnu: cross-base: Removed useless inputs to xhurd-core-headers., guix-commits, 2023/03/30
- 08/21: gnu: gnumach: Update to 1.8+git20220827., guix-commits, 2023/03/30
- 02/21: gnu: cross-base: Use gexps for 'cross-gcc-arguments'., guix-commits, 2023/03/30
- 10/21: gnu: hurd: Remove useless glibc/hurd-headers input., guix-commits, 2023/03/30
- 11/21: gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig.,
guix-commits <=
- 13/21: gnu: mig/32-bit: Remove., guix-commits, 2023/03/30
- 09/21: gnu: hurd: Update to 3ff7053., guix-commits, 2023/03/30
- 16/21: gnu: linux-pam: Allow compilation on GNU/Hurd., guix-commits, 2023/03/30
- 18/21: gnu: guile: Switch to gexps., guix-commits, 2023/03/30
- 04/21: gnu: cross-base: Factor out cross-mig., guix-commits, 2023/03/30
- 14/21: system: hurd: Use shepherd-0.8 in the package list., guix-commits, 2023/03/30
- 15/21: gnu: linux-pam: Switch to gexps., guix-commits, 2023/03/30
- 12/21: gnu: hurd: Update DDE and use libdde_linux26., guix-commits, 2023/03/30
- 17/21: gnu: guile-static: Switch to gexps., guix-commits, 2023/03/30
- 21/21: maint: Re-add IceCat to '%system-packages'., guix-commits, 2023/03/30