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

gnu: glibc/linux: Fix build of glibc-intermediate. 

This is a follow-up to commit b2fd8f6367.

* gnu/packages/base.scm (glibc/linux)[arguments]: Take patch from either
native-inputs or just inputs; fix syntax error; report errors on patch
failure.
master
Ricardo Wurmus 2017-04-30 13:01:20 +02:00
parent dc00f63527
commit c2e4f14ac8
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/base.scm
View File

@ -670,10 +670,13 @@ store.")
;; TODO: Move the patch to 'patches' in the next update cycle.
,@(if (string-prefix? "i686" (or (%current-target-system)
(%current-system)))
`(zero? (system* "patch" "-p1" "--force"
"--input"
(assoc-ref native-inputs
"glibc-memchr-overflow-i686.patch")))
`((unless (zero? (system* "patch" "-p1" "--force"
"--input"
(or (assoc-ref native-inputs
"glibc-memchr-overflow-i686.patch")
(assoc-ref inputs
"glibc-memchr-overflow-i686.patch"))))
(error "patch failed for glibc-memchr-overflow-i686.patch")))
'())
;; Have `system' use that Bash.