[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/23: gnu: commencement: glibc-intermediate: Build fixes for the Hurd.
From: |
guix-commits |
Subject: |
07/23: gnu: commencement: glibc-intermediate: Build fixes for the Hurd. |
Date: |
Thu, 26 Mar 2020 08:14:58 -0400 (EDT) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 05a852d8dda891dfd7f7e5d3f8c475ce378b1396
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 | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7e3109f..446e326 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3230,7 +3230,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
@@ -3241,13 +3243,14 @@ 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?)
+ '((substitute* '("sysdeps/mach/Makefile"
+ "sysdeps/mach/hurd/Makefile")
+ (("LDLIBS-pthread.so =.*")
+ (string-append "LDLIBS-pthread.so = "
+ (assoc-ref %build-inputs
"kernel-headers")
+ "/lib/libihash.a\n"))))
+ '())
;; 'rpcgen' needs native libc headers to be built.
(substitute* "sunrpc/Makefile"
@@ -3268,7 +3271,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))
'())
- branch core-updates updated (3342a11 -> 3a1c364), guix-commits, 2020/03/26
- 02/23: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/26
- 03/23: gnu: make: Support for the Hurd., guix-commits, 2020/03/26
- 04/23: gnu: commencement: gnumach-headers-boot0: Build from tarball., guix-commits, 2020/03/26
- 07/23: gnu: commencement: glibc-intermediate: Build fixes for the Hurd.,
guix-commits <=
- 01/23: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/26
- 05/23: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/26
- 06/23: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/26
- 08/23: gnu: commencement: hurd-source: Update to latest git., guix-commits, 2020/03/26
- 09/23: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/26
- 14/23: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/26
- 15/23: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/26
- 12/23: daemon: Do not use clone on the Hurd., guix-commits, 2020/03/26
- 13/23: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/26
- 16/23: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/26