[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/57: bootstrap: gcc-mesboot0: Use Gash instead of coretutils&co.
From: |
guix-commits |
Subject: |
24/57: bootstrap: gcc-mesboot0: Use Gash instead of coretutils&co. |
Date: |
Mon, 16 Dec 2019 13:20:09 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3e55fd9e034c05d399213e478ffa93e4cdb86bab
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 16:16:59 2019 +0100
bootstrap: 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.
---
gnu/packages/commencement.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4c1ccbd..69eba6c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1625,15 +1625,10 @@ BASH = ")))
(package
(inherit gcc-core-mesboot0)
(name "gcc-mesboot0")
- (native-inputs `(("binutils" ,binutils-mesboot0)
- ("gcc" ,gcc-core-mesboot0)
+ (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch"))
("libc" ,glibc-mesboot0)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot0)))
+ ,@(%boot-mesboot-core-inputs)))
(arguments
(substitute-keyword-arguments (package-arguments gcc-core-mesboot0)
((#:phases phases)
@@ -1670,11 +1665,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(let* ((out (assoc-ref outputs "out"))
(gcc-dir (string-append
out
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3")))
- (mkdir-p "tmp")
- (zero? (system (string-append "set -x; cd tmp && ar x
../gcc/libgcc2.a")))
- (zero? (system (string-append "set -x; cd tmp && ar r "
gcc-dir "/libgcc.a *.o")))
- (copy-file "gcc/libgcc2.a" (string-append out
"/lib/libgcc2.a"))
- #t)))))
+ (and
+ (mkdir-p "tmp")
+ (zero? (system (string-append "set -x; cd tmp && ar x
../gcc/libgcc2.a")))
+ (zero? (system (string-append "set -x; cd tmp && ar r "
gcc-dir "/libgcc.a *.o")))
+ (copy-file "gcc/libgcc2.a" (string-append out
"/lib/libgcc2.a"))))))))
((#:configure-flags configure-flags)
`(let ((out (assoc-ref %outputs "out")))
`("--disable-shared"
@@ -1688,6 +1683,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include")
"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
(package
(inherit binutils-mesboot0)
- 07/57: bootstrap: Add gash-core-utils-boot., (continued)
- 07/57: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/12/16
- 10/57: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 13/57: bootstrap: Add bzip2-mesboot., guix-commits, 2019/12/16
- 15/57: bootstrap: tcc-boot: Use Gash instead of coretutils&co., guix-commits, 2019/12/16
- 18/57: bootstrap: Add sed-mesboot0., guix-commits, 2019/12/16
- 03/57: bootstrap: Add janneke's guix package url., guix-commits, 2019/12/16
- 06/57: bootstrap: Add gash-boot., guix-commits, 2019/12/16
- 11/57: bootstrap: Add gzip-mesboot., guix-commits, 2019/12/16
- 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 <=
- 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, 2019/12/16
- 30/57: bootstrap: Add gawk-mesboot., guix-commits, 2019/12/16
- 49/57: bootstrap: Add bzip2-boot0., guix-commits, 2019/12/16