janneke pushed a commit to branch wip-hurd
in repository guix.
commit 8f22e648c1347f5d9d7704b6ecd7f5d310a4cb11
Author: Jan Nieuwenhuizen <[email protected]>
AuthorDate: Mon Mar 2 23:59:56 2020 -0500
gnu: commencement: glibc-intermediate: Build fixes for the Hurd.
* gnu/packages/commencement.scm (glibc-intermediate): Configure with
--disable-werror, update pthreads workaround.
---
gnu/packages/commencement.scm | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b4d6fd9..aec9a38 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3240,7 +3240,9 @@ the bootstrap environment."
((#:configure-flags flags)
`(append (list ,(string-append "--host=" (boot-triplet))
,(string-append "--build="
- (nix-system->gnu-triplet)))
+ (nix-system->gnu-triplet))
+ ,(if (hurd-system?) "--disable-werror"
+ ""))
,flags))
((#:phases phases)
`(modify-phases ,phases
@@ -3251,12 +3253,16 @@ the bootstrap environment."
(unsetenv "CPATH")
;; Tell 'libpthread' where to find 'libihash' on Hurd
systems.
- ,@(if (hurd-triplet? (%current-system))
- `((substitute* "libpthread/Makefile"
- (("LDLIBS-pthread.so =.*")
- (string-append "LDLIBS-pthread.so = "
- (assoc-ref %build-inputs
"kernel-headers")
- "/lib/libihash.a\n"))))
+ ,@(if (hurd-system?)
+ `(map
+ (lambda (f)
+ (substitute* f
+ (("LDLIBS-pthread.so =.*")
+ (string-append "LDLIBS-pthread.so = "
+ (assoc-ref %build-inputs
"kernel-headers")
+ "/lib/libihash.a\n")))
+ '("sysdeps/mach/Makefile"
+ "sysdeps/mach/hurd/Makefile:")))
'())
;; 'rpcgen' needs native libc headers to be built.
@@ -3278,7 +3284,7 @@ the bootstrap environment."
,@(%boot1-inputs)
;; A native MiG is needed to build Glibc on Hurd.
- ,@(if (hurd-triplet? (%current-system))
+ ,@(if (hurd-system?)
`(("mig" ,mig-boot0))
'())
