diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 20:02:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 20:02:03 +0100 |
| commit | ef5821093adfddf80ec472652b6b00439412fa47 (patch) | |
| tree | c7d19b52c08068665d0284ed17b14c71dac0f2a4 /gnu/packages/cross-base.scm | |
| parent | ea8be005d409658dea4f4356e9279784ce0a5a39 (diff) | |
| download | guix-patches-ef5821093adfddf80ec472652b6b00439412fa47.tar guix-patches-ef5821093adfddf80ec472652b6b00439412fa47.tar.gz | |
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".
Diffstat (limited to 'gnu/packages/cross-base.scm')
| -rw-r--r-- | gnu/packages/cross-base.scm | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bb3d6d916a..2fcb7fb36b 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))))))) |