[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap.
From: |
guix-commits |
Subject: |
48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap. |
Date: |
Fri, 22 Nov 2019 18:17:58 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0ce8a061492a05dba8bea9a77a28818243a99523
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 22:31:06 2019 +0100
bootstrap: gcc-mesboot: Scheme-only bootstrap.
* gnu/packages/commencement.scm (gcc-mesboot): Scheme-only bootstrap.
---
gnu/packages/commencement.scm | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 832829f..9f6400a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2504,16 +2504,24 @@ exec " gcc "/bin/" program
(name "gcc-mesboot")
(version "4.9.4")
(source (bootstrap-origin (package-source gcc-4.9)))
- (native-inputs `(("binutils" ,binutils-mesboot)
+ (native-inputs `(("bash" ,bash-mesboot)
+ ("binutils" ,binutils-mesboot)
+ ("bzip2" ,bzip2-mesboot0)
+ ("coreutils" ,coreutils-mesboot0)
+ ("diffutils" ,diffutils-mesboot)
+ ("gawk" ,gawk-mesboot)
("gcc-wrapper" ,gcc-mesboot1-wrapper)
("gcc" ,gcc-mesboot1)
+ ("grep" ,grep-mesboot)
+ ("gzip" ,gzip-mesboot0)
("libc" ,glibc-mesboot)
+ ("make" ,make-mesboot)
+ ("patch" ,patch-mesboot0)
+ ("sed" ,sed-mesboot)
+ ("tar" ,tar-mesboot)
+ ("xz" ,xz-mesboot)
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("kernel-headers" ,%bootstrap-linux-libre-headers)))
(arguments
`(#:validate-runpath? #f
,@(substitute-keyword-arguments (package-arguments gcc-mesboot1)
@@ -2558,6 +2566,9 @@ exec " gcc "/bin/" program
"--disable-build-with-cxx")))
((#:phases phases)
`(modify-phases ,phases
+ (delete 'apply-boot-patch)
+ (delete 'unpack-g++) ; sadly, gcc-4.9.4 does not provide
+ ; modular core/language downloads
(replace 'setenv
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -2568,12 +2579,12 @@ exec " gcc "/bin/" program
(kernel-headers (assoc-ref %build-inputs
"kernel-headers")))
(setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append
- gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include"
+ gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include"
":" kernel-headers "/include"
":" glibc "/include"
":" (getcwd) "/mpfr/src"))
(setenv "CPLUS_INCLUDE_PATH" (string-append
- gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include"
+ gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include"
":" kernel-headers
"/include"
":" glibc "/include"
":" (getcwd) "/mpfr/src"))
- 28/54: Revert "bootstrap: Add bash-mesboot1.", (continued)
- 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
- 38/54: bootstrap: Add sed-mesboot., guix-commits, 2019/11/22
- 49/54: bootstrap: gcc-mesboot-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/22
- 42/54: bootstrap: Add xz-mesboot., guix-commits, 2019/11/22
- 48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap.,
guix-commits <=
- 43/54: bootstrap: Add hello-mesboot., guix-commits, 2019/11/22
- 47/54: bootstrap: gcc-mesboot1-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/22
- 46/54: bootstrap: glibc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 37/54: bootstrap: Add gawk-mesboot., guix-commits, 2019/11/22
- 20/54: bootstrap: tcc-boot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 41/54: bootstrap: Add gcc-mesboot1: Scheme-only bootstrap., guix-commits, 2019/11/22
- 53/54: bootstrap: Add sed-boot0., guix-commits, 2019/11/22
- 50/54: bootstrap: Add coreutils-mesboot., guix-commits, 2019/11/22
- 54/54: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2019/11/22
- 36/54: bootstrap: Add make-mesboot., guix-commits, 2019/11/22