GNU bug report logs - #62307
[PATCH core-updates 00/15] Update Hurd and fix build failures

Previous Next

Full log

View this message in rfc822 format

From: Ludovic Courtès <ludo <at> gnu.org>
To: 62307 <at> debbugs.gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>, Ludovic Courtès <ludo <at> gnu.org>
Subject: [bug#62307] [PATCH core-updates v2 05/20] gnu: cross-base: Add cross arguments to hurd derivatives.
Date: Tue, 28 Mar 2023 16:28:37 +0200

From: Josselin Poiret <dev <at> jpoiret.xyz>

* gnu/packages/cross-base.scm (cross-kernel-headers*): Add --build and --host to
xhurd-headers and xhurd-minimal.

Signed-off-by: Ludovic Courtès <ludo <at> gnu.org>
---
 gnu/packages/cross-base.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2a7c4d8011..bda494fd02 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -458,10 +458,17 @@ (define xhurd-headers
       (name (string-append (package-name hurd-headers)
                            "-cross-" target))
 
+      (arguments
+       (substitute-keyword-arguments (package-arguments hurd-headers)
+         ((#:configure-flags flags)
+          `(cons* ,(string-append "--build=" (%current-system))
+                  ,(string-append "--host=" target)
+                  ,flags))))
+
       (native-inputs `(("cross-gcc" ,xgcc)
                        ("cross-binutils" ,xbinutils)
                        ("cross-mig" ,xmig)
-                       ,@(alist-delete "mig"(package-native-inputs hurd-headers))))))
+                       ,@(alist-delete "mig" (package-native-inputs hurd-headers))))))
 
   (define xglibc/hurd-headers
     (package
@@ -506,6 +513,10 @@ (define xhurd-minimal
                         (guix build utils)
                         (srfi srfi-26))
              ,@(package-arguments hurd-minimal))
+         ((#:configure-flags flags)
+          `(cons* ,(string-append "--build=" (%current-system))
+                  ,(string-append "--host=" target)
+                  ,flags))
          ((#:phases phases)
           `(modify-phases ,phases
              (add-before 'configure 'set-cross-headers-path
-- 
2.39.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.