[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/33: gnu: commencement: glibc-final: Allow gnumach-headers references.
From: |
guix-commits |
Subject: |
31/33: gnu: commencement: glibc-final: Allow gnumach-headers references. |
Date: |
Tue, 10 Mar 2020 03:58:52 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 8d113be06d6961fe2d1d11ee5b1fa4f33a49da11
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Tue Mar 3 20:14:24 2020 +0100
gnu: commencement: glibc-final: Allow gnumach-headers references.
* gnu/packages/commencement.scm (glibc-final): Allow gnumach-headers-boot0
references for the Hurd.
---
gnu/packages/commencement.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 11eab51..eed0fb5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3381,7 +3381,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
"/lib"))))
((#:phases phases)
`(modify-phases ,phases
- ,@(if (hurd-target?)
+ ,@(if (hurd-system?)
'((add-after 'unpack 'patch-man2html
(lambda _
(substitute* "support/Makefile.in"
@@ -3448,10 +3448,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker
-Wl,~a/~a \"$@\"~%"
;; if 'allowed-references' were per-output.
(arguments
`(#:allowed-references
- ,(cons* `(,gcc-boot0 "lib") (kernel-headers-boot0)
- static-bash-for-glibc
- (package-outputs glibc-final-with-bootstrap-bash))
-
+ ((,gcc-boot0 "lib")
+ ,(kernel-headers-boot0)
+ ,static-bash-for-glibc
+ ,@(if (hurd-triplet? (%current-system))
+ `(,gnumach-headers-boot0
+ ,hurd-headers-boot0)
+ '())
+ ,@(package-outputs glibc-final-with-bootstrap-bash))
,@(package-arguments glibc-final-with-bootstrap-bash)))))
(define gcc-boot0-wrapped
- 11/33: gnu: glibc: Add and update patches for the Hurd., (continued)
- 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, 2020/03/10
- 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 <=
- 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
- 28/33: gnu: commencement: Update hurd-source to latest git., guix-commits, 2020/03/10
- 29/33: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/10
- 23/33: gnu: commencement: gcc-boot0: Build fix for the Hurd., guix-commits, 2020/03/10
- 20/33: gnu: screen: Build fix for the Hurd., guix-commits, 2020/03/10
- 33/33: daemon: Workaround issues for the Hurd., guix-commits, 2020/03/10