branch master updated: gnu: gcc-11: Fix patch-hurd-libpthread phase.

[guix-commits]

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

cbaines pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 6922069bcb gnu: gcc-11: Fix patch-hurd-libpthread phase.
6922069bcb is described below

commit 6922069bcbe5c08da09c00e5aad44e390ebd1cc7
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri May 5 14:25:49 2023 +0100

    gnu: gcc-11: Fix patch-hurd-libpthread phase.
    
    It didn't work when it was introduced in
    08acdd0765b5f4fbfafa699a823ea7985d4d35a7.
    
    * gnu/packages/gcc.scm (gcc-11)[arguments]: Remove the procedure arguments,
    and use %build-inputs rather than inputs.
    * gnu/packages/commencement.scm (gcc-boot0)[native-inputs]: Add hurd-patch, 
as
    this package inherits from gcc-11.
---
 gnu/packages/commencement.scm | 5 ++++-
 gnu/packages/gcc.scm          | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 25e96b1aa6..fc1c508b38 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2452,7 +2452,10 @@ exec " gcc "/bin/" program
               ,@(alist-delete "libc" (%boot0-inputs))))
 
     ;; No need for the native-inputs to build the documentation at this stage.
-    (native-inputs `())))
+    (native-inputs
+     (if (target-hurd?)
+         `(("hurd-patch" ,(search-patch 
"gcc-11-libstdc++-hurd-libpthread.patch")))
+         '()))))
 
 (define perl-boot0
   (package
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 9ae6f77b37..fade5bb64b 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -719,10 +719,9 @@ It also includes runtime support libraries for these 
languages.")
        (if (target-hurd?)
            `(modify-phases ,phases
               (add-after 'unpack 'patch-hurd-libpthread
-                (lambda (#:key inputs)
+                (lambda _
                   (invoke "patch" "--force" "-p1" "-i"
-                          (assoc-ref inputs "hurd-patch")
-                          patch))))
+                          (assoc-ref %build-inputs "hurd-patch")))))
            phases))))
    (properties
     `((compiler-cpu-architectures