me/guix
Archived
1
0
Fork 0
Code Activity

gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co.

Browse source 
* gnu/packages/commencement.scm (glibc-mesboot): Use Gash instead of
coreutils&co.
This commit is contained in:
Jan Nieuwenhuizen 2019-11-22 22:16:22 +01:00
parent c8a2128a1f
commit 6ff4188195
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/commencement.scm
View file

@ -2490,19 +2490,10 @@ SHELL := " shell "
(package (package
(inherit glibc-headers-mesboot) (inherit glibc-headers-mesboot)
(name "glibc-mesboot") (name "glibc-mesboot")
(native-inputs `(("binutils" ,binutils-mesboot) (native-inputs `(("headers" ,glibc-headers-mesboot)
("libc" ,glibc-mesboot0) ,@(%boot-mesboot3-inputs)))
("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)))
(arguments (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) ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot)
((#:make-flags make-flags) ((#:make-flags make-flags)
`(let ((bash (assoc-ref %build-inputs "bash"))) `(let ((bash (assoc-ref %build-inputs "bash")))
@ -2514,9 +2505,13 @@ SHELL := " shell "
(let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers"))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
(install-flags (cons "install" make-flags))) (install-flags (cons "install" make-flags)))
(apply invoke "make" install-flags) (and (apply invoke "make" install-flags)
(copy-recursively kernel-headers out) (copy-recursively kernel-headers out)
#t)))))))))) #t)))))))))))
(define (%boot-mesboot4-inputs)
`(("libc" ,glibc-mesboot)
,@(alist-delete "libc" (%boot-mesboot3-inputs))))
(define gcc-mesboot (define gcc-mesboot
(package (package