From ef5821093adfddf80ec472652b6b00439412fa47 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2018 20:02:03 +0100 Subject: gnu: glibc: Inline Hurd "pid/…" magic lookup patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 64f60a928e..127ac7a75f 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 -- cgit v1.2.3