[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/63: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&c
From: |
guix-commits |
Subject: |
37/63: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co. |
Date: |
Thu, 13 Feb 2020 10:11:24 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit eabd6c9c6f8682410ac500312e3c2e3da6c01946
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 22:16:22 2019 +0100
gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (glibc-mesboot): Use Gash instead of
coreutils&co.
---
gnu/packages/commencement.scm | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index eb51fab..bf41969 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2489,19 +2489,10 @@ SHELL := " shell "
(package
(inherit glibc-headers-mesboot)
(name "glibc-mesboot")
- (native-inputs `(("binutils" ,binutils-mesboot)
- ("libc" ,glibc-mesboot0)
- ("headers" ,glibc-headers-mesboot)
- ("gcc" ,gcc-mesboot1)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
-
+ (native-inputs `(("headers" ,glibc-headers-mesboot)
+ ,@(%boot-mesboot3-inputs)))
(arguments
- `(#:validate-runpath? #f ; fails when using --enable-shared
+ `(#:validate-runpath? #f ; fails when using --enable-shared
,@(substitute-keyword-arguments (package-arguments
glibc-headers-mesboot)
((#:make-flags make-flags)
`(let ((bash (assoc-ref %build-inputs "bash")))
@@ -2513,9 +2504,13 @@ SHELL := " shell "
(let* ((kernel-headers (assoc-ref %build-inputs
"kernel-headers"))
(out (assoc-ref outputs "out"))
(install-flags (cons "install" make-flags)))
- (apply invoke "make" install-flags)
- (copy-recursively kernel-headers out)
- #t))))))))))
+ (and (apply invoke "make" install-flags)
+ (copy-recursively kernel-headers out)
+ #t)))))))))))
+
+(define (%boot-mesboot4-inputs)
+ `(("libc" ,glibc-mesboot)
+ ,@(alist-delete "libc" (%boot-mesboot3-inputs))))
(define gcc-mesboot
(package
- 50/63: gnu: commencement: coreutils-final: Inherit from coreutils-minimal., (continued)
- 50/63: gnu: commencement: coreutils-final: Inherit from coreutils-minimal., guix-commits, 2020/02/13
- 11/63: gnu: commencement: Add bzip2-mesboot., guix-commits, 2020/02/13
- 04/63: gnu: commencement: Add gash-boot., guix-commits, 2020/02/13
- 06/63: gnu: commencement: Add %bootstrap-mes-rewired., guix-commits, 2020/02/13
- 19/63: gnu: commencement: Add gawk-mesboot0., guix-commits, 2020/02/13
- 23/63: gnu: commencement: Add tar-mesboot., guix-commits, 2020/02/13
- 29/63: gnu: commencement: Add sed-mesboot., guix-commits, 2020/02/13
- 21/63: gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/13
- 28/63: gnu: commencement: Add gawk-mesboot., guix-commits, 2020/02/13
- 35/63: gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 37/63: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.,
guix-commits <=
- 24/63: gnu: commencement: Add grep-mesboot., guix-commits, 2020/02/13
- 34/63: gnu: commencement: Add hello-mesboot., guix-commits, 2020/02/13
- 39/63: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 40/63: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 44/63: gnu: commencement: Add gawk-boot0., guix-commits, 2020/02/13
- 42/63: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/13
- 46/63: gnu: commencement: Add patch-boot0., guix-commits, 2020/02/13
- 30/63: gnu: commencement: Add gcc-core-mesboot1., guix-commits, 2020/02/13
- 47/63: gnu: commencement: Add bzip2-boot0., guix-commits, 2020/02/13
- 54/63: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2020/02/13