me
/
guix
Archived
1
0
Fork 0
Code

gnu: cross-base: Move glibc Hurd patches to 'inputs'. 

Fixes "guix build --target=i586-pc-gnu bootstrap-tarballs".

* gnu/packages/cross-base.scm (cross-libc): Move Hurd patches from
'native-inputs' to 'inputs'.
master
Ludovic Courtès 2020-11-08 16:55:07 +01:00
parent 4e9ded6d27
commit bc47583412
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/cross-base.scm
View File

@ -539,19 +539,20 @@ and the cross tool chain."
;; FIXME: 'static-bash' should really be an input, not a native input, but ;; FIXME: 'static-bash' should really be an input, not a native input, but
;; to do that will require building an intermediate cross libc. ;; to do that will require building an intermediate cross libc.
(inputs '()) (inputs (if (hurd-triplet? target)
`(;; TODO: move to glibc in the next rebuild cycle
("hurd-mach-print.patch"
,(search-patch "glibc-hurd-mach-print.patch"))
("hurd-gettyent.patch"
,(search-patch "glibc-hurd-gettyent.patch")))
'()))
(native-inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)
,@(if (hurd-triplet? target) ,@(if (hurd-triplet? target)
`(("cross-mig" `(("cross-mig"
,@(assoc-ref (package-native-inputs xheaders) ,@(assoc-ref (package-native-inputs xheaders)
"cross-mig")) "cross-mig")))
;; TODO: move to glibc in the next rebuild cycle
("hurd-mach-print.patch"
,@(search-patches "glibc-hurd-mach-print.patch"))
("hurd-gettyent.patch"
,@(search-patches "glibc-hurd-gettyent.patch")))
'()) '())
,@(package-inputs libc) ;FIXME: static-bash ,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc)))))) ,@(package-native-inputs libc))))))