branch hurd-team updated: squash! DRAFT gnu: gnumach: Fix build for i686-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch hurd-team
in repository guix.

The following commit(s) were added to refs/heads/hurd-team by this push:
     new accf3fdbb4 squash! DRAFT gnu: gnumach: Fix build for i686-linux.
accf3fdbb4 is described below

commit accf3fdbb465e0e3bb786318088a7c5271bdfc04
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jan 21 22:13:38 2024 +0100

    squash! DRAFT gnu: gnumach: Fix build for i686-linux.
    
    configure.ac uses CFLAGS="$CFLAGS -ffreestanding -nostdlib" to avoid the
    compiler turning printf into puts, e.g.
    
    * gnu/packages/hurd.scm (gnumach)[source]: Use it.
    [arguments]: Remove #:make-flags to avoid overriding CFLAGS.
    
    Change-Id: I5f3525aa75898135b4a7b784201a8f11fc68870e
---
 gnu/packages/hurd.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index eb46fd561d..20b736b6cb 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -255,12 +255,11 @@ Hurd-minimal package which are needed for both glibc and 
GCC.")
               (inherit (package-source gnumach-headers))
               (patches
                (append
-                (search-patches "gnumach-support-noide.patch")
+                (search-patches `("gnumach-support-noide.patch"
+                                  "gnumach-fix-x86.patch"))
                 (origin-patches (package-source gnumach-headers))))))
     (arguments
      (substitute-keyword-arguments (package-arguments gnumach-headers)
-       ((#:make-flags flags ''())
-        `(cons "CFLAGS=-fcommon" ,flags))
        ((#:configure-flags flags ''())
         `(cons* "--enable-kdb"          ;enable kernel debugger
                 "--disable-net-group"
@@ -273,15 +272,7 @@ Hurd-minimal package which are needed for both glibc and 
GCC.")
               (lambda _
                 (let ((boot (string-append #$output "/boot")))
                   (invoke "make" "gnumach.gz")
-                  (install-file "gnumach.gz" boot))))
-            #$@(if (target-x86?)
-                   #~((add-after 'unpack 'fix-build
-                        (lambda _
-                          (let ((patch-file
-                                 #$(local-file
-                                    (search-patch "gnumach-fix-x86.patch"))))
-                            (invoke "patch" "--force" "-p1" "-i" 
patch-file)))))
-                   '())))))
+                  (install-file "gnumach.gz" boot))))))))
     (native-inputs
      (list autoconf
            automake