[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/64: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&c
From: |
guix-commits |
Subject: |
37/64: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co. |
Date: |
Tue, 18 Feb 2020 01:18:10 -0500 (EST) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 6ff41881953046cf1b775560e82b59ca8ef17c23
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 9a20add..c6b05d4 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2490,19 +2490,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")))
@@ -2514,9 +2505,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
- 47/64: gnu: commencement: Add patch-boot0., (continued)
- 47/64: gnu: commencement: Add patch-boot0., guix-commits, 2020/02/18
- 44/64: gnu: commencement: file: Build file without bzip2., guix-commits, 2020/02/18
- 48/64: gnu: commencement: Add bzip2-boot0., guix-commits, 2020/02/18
- 49/64: gnu: commencement: Add tar-boot0., guix-commits, 2020/02/18
- 50/64: gnu: commencement: Add coreutils-boot0., guix-commits, 2020/02/18
- 53/64: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2020/02/18
- 59/64: gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only., guix-commits, 2020/02/18
- 62/64: gnu: commencement: Simplify Gash and Gash-Utils., guix-commits, 2020/02/18
- 64/64: gnu: commencement: Fix '%boot-mesboot1-inputs'., guix-commits, 2020/02/18
- 63/64: gnu: commencement: Remove %bootstrap-guile+guild., guix-commits, 2020/02/18
- 37/64: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.,
guix-commits <=
- 52/64: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball., guix-commits, 2020/02/18
- 60/64: gnu: Rename 'gash-core-utils' to 'gash-utils'., guix-commits, 2020/02/18
- 58/64: gnu: commencement: mes-boot: Update to 0.22., guix-commits, 2020/02/18
- 46/64: gnu: commencement: Add sed-boot0., guix-commits, 2020/02/18
- 43/64: gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 51/64: gnu: commencement: coreutils-final: Inherit from coreutils-minimal., guix-commits, 2020/02/18
- 57/64: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix., guix-commits, 2020/02/18
- 55/64: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2020/02/18
- 56/64: gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b., guix-commits, 2020/02/18
- 54/64: gnu: commencement: gnu-make-mesboot0: Rename from make-mesboot0., guix-commits, 2020/02/18