[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/58: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&c
From: |
guix-commits |
Subject: |
37/58: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co. |
Date: |
Thu, 6 Feb 2020 17:52:22 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f8cab005975be87aa4dfbe601687932339a9ce69
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
- 23/58: gnu: commencement: Add tar-mesboot., (continued)
- 23/58: gnu: commencement: Add tar-mesboot., guix-commits, 2020/02/06
- 26/58: gnu: commencement: Add coreutils-mesboot0., guix-commits, 2020/02/06
- 25/58: gnu: commencement: Add binutils-mesboot1., guix-commits, 2020/02/06
- 15/58: gnu: commencement: Add patch-mesboot., guix-commits, 2020/02/06
- 21/58: gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 51/58: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball., guix-commits, 2020/02/06
- 44/58: gnu: commencement: Add gawk-boot0., guix-commits, 2020/02/06
- 31/58: gnu: commencement: Add bash-mesboot., guix-commits, 2020/02/06
- 30/58: gnu: commencement: Add gcc-core-mesboot1., guix-commits, 2020/02/06
- 36/58: gnu: commencement: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 37/58: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.,
guix-commits <=
- 18/58: gnu: commencement: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 24/58: gnu: commencement: Add grep-mesboot., guix-commits, 2020/02/06
- 32/58: gnu: commencement: Add gcc-mesboot1: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 34/58: gnu: commencement: Add hello-mesboot., guix-commits, 2020/02/06
- 38/58: gnu: commencement: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 33/58: gnu: commencement: Add xz-mesboot., guix-commits, 2020/02/06
- 43/58: gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 42/58: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/06
- 55/58: gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b., guix-commits, 2020/02/06
- 50/58: gnu: commencement: coreutils-final: Inherit from coreutils-minimal., guix-commits, 2020/02/06