03/03: gnu: glibc: Inline Hurd "pid/…" magic lookup patch.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit ef5821093adfddf80ec472652b6b00439412fa47
Author: Ludovic Courtès <address@hidden>
Date:   Thu Dec 20 20:02:03 2018 +0100

    gnu: glibc: Inline Hurd "pid/…" magic lookup patch.
    
    * gnu/packages/base.scm (glibc)[source](patches): Add
    "glibc-hurd-magic-pid.patch".
    [arguments]: Remove 'apply-hurd-patch' phase.
    [native-inputs]: Remove "hurd-magic-pid-patch".
    * gnu/packages/cross-base.scm (cross-libc)[arguments]: Remove
    'apply-hurd-patch' phase.
    [native-inputs]: Remove "hurd-magic-pid-patch".
---
 gnu/packages/base.scm       | 17 ++---------------
 gnu/packages/cross-base.scm | 21 +--------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 64f60a9..127ac7a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -607,6 +607,7 @@ store.")
                                      "glibc-versioned-locpath.patch"
                                      "glibc-allow-kernel-2.6.32.patch"
                                      "glibc-reinstate-prlimit64-fallback.patch"
+                                     "glibc-hurd-magic-pid.patch"
                                      "glibc-supported-locales.patch"))))
    (build-system gnu-build-system)
 
@@ -682,18 +683,6 @@ store.")
 
       #:tests? #f                                 ; XXX
       #:phases (modify-phases %standard-phases
-                 ,@(if (hurd-target?)
-                       `((add-after 'unpack 'apply-hurd-patch
-                           (lambda* (#:key inputs native-inputs
-                                     #:allow-other-keys)
-                             ;; TODO: Move this to 'patches' field.
-                             (let ((patch (or (assoc-ref native-inputs
-                                                         
"hurd-magic-pid-patch")
-                                              (assoc-ref inputs
-                                                         
"hurd-magic-pid-patch"))))
-                               (invoke "patch" "-p1" "--force" "--input"
-                                       patch)))))
-                       '())
                  (add-before
                   'configure 'pre-configure
                   (lambda* (#:key inputs native-inputs outputs
@@ -819,9 +808,7 @@ store.")
 
                     ,@(if (hurd-target?)
                           `(("mig" ,mig)
-                            ("perl" ,perl)
-                            ("hurd-magic-pid-patch"
-                             ,(search-patch "glibc-hurd-magic-pid.patch")))
+                            ("perl" ,perl))
                           '())))
 
    (native-search-paths
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index bb3d6d9..2fcb7fb 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -454,23 +454,6 @@ XBINUTILS and the cross tool chain."
                           flags)))
              ((#:phases phases)
               `(modify-phases ,phases
-                 ;; XXX: The hack below allows us to make sure the
-                 ;; 'apply-hurd-patch' phase gets added in the first
-                 ;; cross-libc, but does *not* get added twice subsequently
-                 ;; when cross-building another libc.
-                 ,@(if (and (hurd-triplet? target)
-                            (not (hurd-target?)))
-                       `((add-after 'unpack 'apply-hurd-patch
-                           (lambda* (#:key inputs native-inputs
-                                     #:allow-other-keys)
-                             ;; TODO: Move this to 'patches' field.
-                             (let ((patch (or (assoc-ref native-inputs
-                                                         
"hurd-magic-pid-patch")
-                                              (assoc-ref inputs
-                                                         
"hurd-magic-pid-patch"))))
-                               (invoke "patch" "-p1" "--force" "--input"
-                                       patch)))))
-                       '())
                  (add-before 'configure 'set-cross-kernel-headers-path
                    (lambda* (#:key inputs #:allow-other-keys)
                      (let* ((kernel (assoc-ref inputs "kernel-headers"))
@@ -494,9 +477,7 @@ XBINUTILS and the cross tool chain."
                            ,@(if (hurd-triplet? target)
                                  `(("cross-mig"
                                     ,@(assoc-ref (package-native-inputs 
xheaders)
-                                                 "cross-mig"))
-                                   ("hurd-magic-pid-patch"
-                                    ,(search-patch 
"glibc-hurd-magic-pid.patch")))
+                                                 "cross-mig")))
                                  '())
                            ,@(package-inputs libc)     ;FIXME: static-bash
                            ,@(package-native-inputs libc)))))))