nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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".
This commit is contained in:
Ludovic Courtès 2018-12-20 20:02:03 +01:00
parent ea8be005d4
commit ef5821093a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/base.scm
View File

@ -607,6 +607,7 @@ store.")
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch" "glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch" "glibc-reinstate-prlimit64-fallback.patch"
"glibc-hurd-magic-pid.patch"
"glibc-supported-locales.patch")))) "glibc-supported-locales.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -682,18 +683,6 @@ store.")
#:tests? #f ; XXX #:tests? #f ; XXX
#:phases (modify-phases %standard-phases #: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 (add-before
'configure 'pre-configure 'configure 'pre-configure
(lambda* (#:key inputs native-inputs outputs (lambda* (#:key inputs native-inputs outputs
@ -819,9 +808,7 @@ store.")
,@(if (hurd-target?) ,@(if (hurd-target?)
`(("mig" ,mig) `(("mig" ,mig)
("perl" ,perl) ("perl" ,perl))
("hurd-magic-pid-patch"
,(search-patch "glibc-hurd-magic-pid.patch")))
'()))) '())))
(native-search-paths (native-search-paths

21
gnu/packages/cross-base.scm
View File

@ -454,23 +454,6 @@ XBINUTILS and the cross tool chain."
flags))) flags)))
((#:phases phases) ((#:phases phases)
`(modify-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 (add-before 'configure 'set-cross-kernel-headers-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((kernel (assoc-ref inputs "kernel-headers")) (let* ((kernel (assoc-ref inputs "kernel-headers"))
@ -494,9 +477,7 @@ XBINUTILS and the cross tool chain."
,@(if (hurd-triplet? target) ,@(if (hurd-triplet? target)
`(("cross-mig" `(("cross-mig"
,@(assoc-ref (package-native-inputs xheaders) ,@(assoc-ref (package-native-inputs xheaders)
"cross-mig")) "cross-mig")))
("hurd-magic-pid-patch"
,(search-patch "glibc-hurd-magic-pid.patch")))
'()) '())
,@(package-inputs libc) ;FIXME: static-bash ,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))) ,@(package-native-inputs libc)))))))