[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
39/57: bootstrap: glibc-mesboot: Use Gash instead of coreutils&co.
From: |
guix-commits |
Subject: |
39/57: bootstrap: glibc-mesboot: Use Gash instead of coreutils&co. |
Date: |
Mon, 16 Dec 2019 13:20:12 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 92b664ad76cd13408968a22d1d71a518f42234b7
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 22:16:22 2019 +0100
bootstrap: 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 cc202e4..90ddef5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2532,19 +2532,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")))
@@ -2556,9 +2547,9 @@ 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)))))))))
(native-search-paths ;; FIXME: move to glibc-mesboot0
;; Use the language-specific variables rather than 'CPATH' because they
;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
@@ -2575,6 +2566,10 @@ SHELL := " shell "
(variable "LIBRARY_PATH")
(files '("lib")))))))
+(define (%boot-mesboot4-inputs)
+ `(("libc" ,glibc-mesboot)
+ ,@(alist-delete "libc" (%boot-mesboot3-inputs))))
+
(define gcc-mesboot
(package
(inherit gcc-mesboot1)
- 17/57: bootstrap: Add patch-mesboot., (continued)
- 17/57: bootstrap: Add patch-mesboot., guix-commits, 2019/12/16
- 14/57: bootstrap: Add bash-mesboot0., guix-commits, 2019/12/16
- 24/57: bootstrap: gcc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 23/57: bootstrap: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 25/57: bootstrap: Add tar-mesboot., guix-commits, 2019/12/16
- 27/57: bootstrap: Add binutils-mesboot1., guix-commits, 2019/12/16
- 28/57: bootstrap: Add coreutils-mesboot0., guix-commits, 2019/12/16
- 29/57: bootstrap: Add make-mesboot., guix-commits, 2019/12/16
- 33/57: bootstrap: Add bash-mesboot., guix-commits, 2019/12/16
- 36/57: bootstrap: Add hello-mesboot., guix-commits, 2019/12/16
- 39/57: bootstrap: glibc-mesboot: Use Gash instead of coreutils&co.,
guix-commits <=
- 30/57: bootstrap: Add gawk-mesboot., guix-commits, 2019/12/16
- 49/57: bootstrap: Add bzip2-boot0., guix-commits, 2019/12/16
- 43/57: bootstrap: Add coreutils-mesboot., guix-commits, 2019/12/16
- 19/57: bootstrap: binutils-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 20/57: bootstrap: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 26/57: bootstrap: Add grep-mesboot., guix-commits, 2019/12/16
- 34/57: bootstrap: Add gcc-mesboot1: Use Gash instead of coreutils&co., guix-commits, 2019/12/16
- 31/57: bootstrap: Add sed-mesboot., guix-commits, 2019/12/16
- 09/57: bootstrap: mes-boot: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 12/57: bootstrap: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2019/12/16