[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd.
From: |
guix-commits |
Subject: |
27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd. |
Date: |
Tue, 10 Mar 2020 03:58:51 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 8f22e648c1347f5d9d7704b6ecd7f5d310a4cb11
Author: Jan Nieuwenhuizen <address@hidden>
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))
'())
- 05/33: gnu: hurd: Fix hurd-target?., (continued)
- 05/33: gnu: hurd: Fix hurd-target?., guix-commits, 2020/03/10
- 06/33: gnu: hurd: Add hurd-system?., guix-commits, 2020/03/10
- 07/33: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/10
- 08/33: gnu: make: Revert to 4.1 for the Hurd., guix-commits, 2020/03/10
- 01/33: gnu: flex-2.6.1: Build fix for the Hurd., guix-commits, 2020/03/10
- 11/33: gnu: glibc: Add and update patches for the Hurd., guix-commits, 2020/03/10
- 02/33: gnu: grub: Build fix for the Hurd., guix-commits, 2020/03/10
- 13/33: gnu: cross-libc: Build fix for the Hurd., guix-commits, 2020/03/10
- 17/33: gnu: pciutils: Build fix for the Hurd., guix-commits, 2020/03/10
- 25/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/10
- 27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd.,
guix-commits <=
- 09/33: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/10
- 18/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/10
- 10/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/10
- 19/33: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/10
- 31/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/10
- 21/33: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/10
- 12/33: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/10
- 16/33: gnu: pciutils: Remove kmod dependency for the Hurd., guix-commits, 2020/03/10
- 14/33: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/10
- 26/33: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/10