me
/
guix
Archived
1
0
Fork 0
Code

gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co. 

* gnu/packages/commencement.scm (gcc-mesboot0): Use Gash instead of
coretutils&co.
* gnu/packages/commencement.scm (%boot-mesboot0-inputs): New variable.
master
Jan Nieuwenhuizen 2019-11-22 16:16:59 +01:00
parent f6b911fb5f
commit 71fb04a5e3
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/commencement.scm
View File

@ -1589,18 +1589,12 @@ BASH = ")))
(package (package
(inherit gcc-core-mesboot0) (inherit gcc-core-mesboot0)
(name "gcc-mesboot0") (name "gcc-mesboot0")
(native-inputs `(("binutils" ,binutils-mesboot0) (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch"))
;; Packages are given in an order that's relevant for ;; Packages are given in an order that's relevant for
;; #include_next purposes. ;; #include_next purposes.
("libc" ,glibc-mesboot0) ("libc" ,glibc-mesboot0)
("kernel-headers" ,%bootstrap-linux-libre-headers) ("kernel-headers" ,%bootstrap-linux-libre-headers)
("gcc" ,gcc-core-mesboot0) ,@(%boot-mesboot-core-inputs)))
("bash" ,%bootstrap-coreutils&co)
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
("make" ,make-mesboot0)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments gcc-core-mesboot0) (substitute-keyword-arguments (package-arguments gcc-core-mesboot0)
((#:phases phases) ((#:phases phases)
@ -1619,11 +1613,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(gcc-dir (string-append (gcc-dir (string-append
out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3")))
(mkdir-p "tmp") (and
(zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) (mkdir-p "tmp")
(zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a")))
(copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o")))
#t))))) (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a"))))))))
((#:configure-flags configure-flags) ((#:configure-flags configure-flags)
`(let ((out (assoc-ref %outputs "out"))) `(let ((out (assoc-ref %outputs "out")))
`("--disable-shared" `("--disable-shared"
@ -1637,6 +1631,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include")
"LANGUAGES=c"))))))) "LANGUAGES=c")))))))
(define (%boot-mesboot0-inputs)
`(("gcc" ,gcc-mesboot0)
("kernel-headers" ,%bootstrap-linux-libre-headers)
("libc" ,glibc-mesboot0)
,@(alist-delete "gcc" (%boot-mesboot-core-inputs))))
(define binutils-mesboot (define binutils-mesboot
(package (package
(inherit binutils-mesboot0) (inherit binutils-mesboot0)