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

gnu: glibc-hurd: Force mach/hurd/libpthread subdirs to build first. 

* gnu/packages/base.scm (glibc/hurd)[arguments]: Replace 'build' phase.

Co-authored-by: Ludovic Court<C3><A8>s <ludo@gnu.org>
This commit is contained in:
Manolis Ragkousis 2016-11-13 15:19:46 +02:00
parent f265a3cee5
commit 9b5f498def
No known key found for this signature in database
GPG Key ID: 327C1EF38DF54C32
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/base.scm
View File

@ -715,7 +715,21 @@ with the Linux kernel.")
;; Use the right 'pwd'. ;; Use the right 'pwd'.
(substitute* "configure" (substitute* "configure"
(("/bin/pwd") "pwd"))) (("/bin/pwd") "pwd")))
,original-phases))) (alist-replace
'build
(lambda _
;; Force mach/hurd/libpthread subdirs to build first in order to avoid
;; linking errors.
;; See <https://lists.gnu.org/archive/html/bug-hurd/2016-11/msg00045.html>
(let ((-j (list "-j" (number->string (parallel-job-count)))))
(let-syntax ((make (syntax-rules ()
((_ target)
(zero? (apply system* "make" target -j))))))
(and (make "mach/subdir_lib")
(make "hurd/subdir_lib")
(make "libpthread/subdir_lib")
(zero? (apply system* "make" -j))))))
,original-phases))))
((#:configure-flags original-configure-flags) ((#:configure-flags original-configure-flags)
`(append (list "--host=i586-pc-gnu" `(append (list "--host=i586-pc-gnu"