ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 23:20:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig.

Browse source 
* gnu/packages/hurd.scm (gnumach, hurd-headers, hurd): Switch to cross-mig when
cross-building.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Josselin Poiret 2023-03-20 23:10:46 +01:00 committed by Ludovic Courtès
parent 4b62a031a2
commit d509aab230
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/hurd.scm
View file

@ -185,7 +185,13 @@ (define-public hurd-headers
"hurd-fix-types-of-read-write-and-readables-methods-2.patch")))) "hurd-fix-types-of-read-write-and-readables-methods-2.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (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 (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -309,7 +315,15 @@ (define-public gnumach
(invoke "make" "gnumach.gz") (invoke "make" "gnumach.gz")
(install-file "gnumach.gz" boot)))))))) (install-file "gnumach.gz" boot))))))))
(native-inputs (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)) (supported-systems (cons "i686-linux" %hurd-systems))
(synopsis "Microkernel of the GNU system") (synopsis "Microkernel of the GNU system")
(description (description
@ -529,12 +543,12 @@ (define-public hurd
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config'
("pkg-config" ,pkg-config)
("mig" ,(if (%current-target-system) ("mig" ,(if (%current-target-system)
;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
;; hence this hack. (cross-mig (module-ref cross-base 'cross-mig)))
mig/32-bit (cross-mig (%current-target-system)))
mig)) mig))
("pkg-config" ,pkg-config)
("perl" ,perl) ("perl" ,perl)
("texinfo" ,texinfo-4) ("texinfo" ,texinfo-4)
("dde-sources" ,dde-sources))) ("dde-sources" ,dde-sources)))