me/guix
Archived
1
0
Fork 0
Code Activity

gnu: commencement: glibc-intermediate: Build fixes for the Hurd.

Browse source 
* gnu/packages/commencement.scm (glibc-intermediate): Configure with
--disable-werror, update pthreads workaround.
This commit is contained in:
Jan Nieuwenhuizen 2020-03-02 23:59:56 -05:00
parent 0c7b63e065
commit 05a852d8dd
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/commencement.scm
View file

@ -3230,7 +3230,9 @@ the bootstrap environment."
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list ,(string-append "--host=" (boot-triplet)) `(append (list ,(string-append "--host=" (boot-triplet))
,(string-append "--build=" ,(string-append "--build="
(nix-system->gnu-triplet))) (nix-system->gnu-triplet))
,(if (hurd-system?) "--disable-werror"
""))
,flags)) ,flags))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
@ -3241,13 +3243,14 @@ the bootstrap environment."
(unsetenv "CPATH") (unsetenv "CPATH")
;; Tell 'libpthread' where to find 'libihash' on Hurd systems. ;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
,@(if (hurd-triplet? (%current-system)) ,@(if (hurd-system?)
`((substitute* "libpthread/Makefile" '((substitute* '("sysdeps/mach/Makefile"
(("LDLIBS-pthread.so =.*") "sysdeps/mach/hurd/Makefile")
(string-append "LDLIBS-pthread.so = " (("LDLIBS-pthread.so =.*")
(assoc-ref %build-inputs "kernel-headers") (string-append "LDLIBS-pthread.so = "
"/lib/libihash.a\n")))) (assoc-ref %build-inputs "kernel-headers")
'()) "/lib/libihash.a\n"))))
'())
;; 'rpcgen' needs native libc headers to be built. ;; 'rpcgen' needs native libc headers to be built.
(substitute* "sunrpc/Makefile" (substitute* "sunrpc/Makefile"
@ -3268,7 +3271,7 @@ the bootstrap environment."
,@(%boot1-inputs) ,@(%boot1-inputs)
;; A native MiG is needed to build Glibc on Hurd. ;; A native MiG is needed to build Glibc on Hurd.
,@(if (hurd-triplet? (%current-system)) ,@(if (hurd-system?)
`(("mig" ,mig-boot0)) `(("mig" ,mig-boot0))
'()) '())