diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-11-22 22:16:22 +0100 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-02-17 23:16:44 +0100 |
| commit | 6ff41881953046cf1b775560e82b59ca8ef17c23 (patch) | |
| tree | a84b2bd5720806184cc028e5ee3dccfdefa0df84 /gnu/packages/commencement.scm | |
| parent | c8a2128a1ffa5934b407c5ebdc2fbe749e9ee199 (diff) | |
| download | guix-6ff41881953046cf1b775560e82b59ca8ef17c23.tar.gz | |
gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (glibc-mesboot): Use Gash instead of coreutils&co.
Diffstat (limited to 'gnu/packages/commencement.scm')
| -rw-r--r-- | gnu/packages/commencement.scm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9a20add6ac..c6b05d48b5 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 |