[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/54: bootstrap: gcc-mesboot0: Scheme-only bootstrap.
From: |
guix-commits |
Subject: |
31/54: bootstrap: gcc-mesboot0: Scheme-only bootstrap. |
Date: |
Fri, 22 Nov 2019 18:17:53 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 6bc22bf93fd5c08ea1ecfd9b7d1b75bff34415fc
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 16:16:59 2019 +0100
bootstrap: gcc-mesboot0: Scheme-only bootstrap.
* gnu/packages/commencement.scm (gcc-mesboot0): Scheme-only bootstrap.
---
gnu/packages/commencement.scm | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 689025f..d867148 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1375,15 +1375,19 @@ BASH = ")))
(package
(inherit gcc-core-mesboot0)
(name "gcc-mesboot0")
- (native-inputs `(("binutils" ,binutils-mesboot0)
+ (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch"))
+ ("binutils" ,binutils-mesboot0)
+ ("bash" ,bash-mesboot0)
("gcc" ,gcc-core-mesboot0)
+ ("gzip" ,gzip-mesboot0)
("libc" ,glibc-mesboot0)
+ ("make" ,make-mesboot0)
+ ("patch" ,patch-mesboot0)
+ ("sed" ,sed-mesboot0)
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot0)))
+ ("gash" ,%bootstrap-gash)
+ ("guile" ,%bootstrap-guile)
+ ("kernel-headers" ,%bootstrap-linux-libre-headers)))
(arguments
(substitute-keyword-arguments (package-arguments gcc-core-mesboot0)
((#:phases phases)
@@ -1420,11 +1424,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"
- 12/54: bootstrap: nyacc-boot. WIP, (continued)
- 12/54: bootstrap: nyacc-boot. WIP, guix-commits, 2019/11/22
- 13/54: bootstrap-gash-rewire? WIP, guix-commits, 2019/11/22
- 15/54: bootstrap: tcc-boot0: Scheme-only bootstrap. WIP, guix-commits, 2019/11/22
- 14/54: bootstrap: mes-boot: Scheme-only bootstrap. WIP, guix-commits, 2019/11/22
- 11/54: bootstrap: bootstrap-mes: Update for mes-0.21. WIP, guix-commits, 2019/11/22
- 16/54: bootstrap: Add gzip-mesboot0., guix-commits, 2019/11/22
- 19/54: bootstrap: Add bash-mesboot0., guix-commits, 2019/11/22
- 17/54: bootstrap: make-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 22/54: bootstrap: Add patch-mesboot0., guix-commits, 2019/11/22
- 24/54: bootstrap: binutils-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 31/54: bootstrap: gcc-mesboot0: Scheme-only bootstrap.,
guix-commits <=
- 23/54: bootstrap: Add sed-mesboot0., guix-commits, 2019/11/22
- 21/54: bootstrap: diffuils-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 18/54: bootstrap: Add bzip2-mesboot0., guix-commits, 2019/11/22
- 28/54: Revert "bootstrap: Add bash-mesboot1.", guix-commits, 2019/11/22
- 32/54: bootstrap: Add tar-mesboot., guix-commits, 2019/11/22
- 30/54: bootstrap: glibc-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 27/54: bootstrap: Add bash-mesboot1., guix-commits, 2019/11/22
- 33/54: bootstrap: Add grep-mesboot., guix-commits, 2019/11/22
- 26/54: bootstrap: Add gawk-mesboot0., guix-commits, 2019/11/22
- 40/54: bootstrap: Add bash-mesboot., guix-commits, 2019/11/22