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

[guix-commits]

civodul pushed a commit to branch version-1.2.0
in repository guix.

commit bc47583412745e38d994a4ba71cda6564aed3a35
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Nov 8 16:55:07 2020 +0100

    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'.
---
 gnu/packages/cross-base.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index b35a3cb..c1e5f2e 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -539,19 +539,20 @@ and the cross tool chain."
 
         ;; FIXME: 'static-bash' should really be an input, not a native input, 
but
         ;; 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)
                          ("cross-binutils" ,xbinutils)
                          ,@(if (hurd-triplet? target)
                                `(("cross-mig"
                                   ,@(assoc-ref (package-native-inputs xheaders)
-                                               "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")))
+                                               "cross-mig")))
                                '())
                          ,@(package-inputs libc)  ;FIXME: static-bash
                          ,@(package-native-inputs libc))))))