[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
39/63: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co.
From: |
guix-commits |
Subject: |
39/63: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co. |
Date: |
Mon, 17 Feb 2020 16:01:01 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2e83d1326116da0a45647dd580b6c70a7c70964d
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 22:31:06 2019 +0100
gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (gcc-mesboot): Use Gash instead of
coreutils&co.
---
gnu/packages/commencement.scm | 45 ++++++++++++++++++++++++++++++++-----------
1 file changed, 34 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fa18616..735bb7b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2520,17 +2520,10 @@ exec " gcc "/bin/" program
(name "gcc-mesboot")
(version (package-version gcc-4.9))
(source (bootstrap-origin (package-source gcc-4.9)))
- (native-inputs `(("binutils" ,binutils-mesboot)
-
- ("libc" ,glibc-mesboot)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("gcc-wrapper" ,gcc-mesboot1-wrapper)
+ (native-inputs `(("gcc-wrapper" ,gcc-mesboot1-wrapper)
("gcc" ,gcc-mesboot1)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot)))
+ ("headers" ,glibc-headers-mesboot)
+ ,@(%boot-mesboot4-inputs)))
(arguments
`(#:validate-runpath? #f
,@(substitute-keyword-arguments (package-arguments gcc-mesboot1)
@@ -2572,7 +2565,37 @@ exec " gcc "/bin/" program
"--disable-libstdcxx-pch"
;; for libcpp ...
- "--disable-build-with-cxx"))))))))
+ "--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"))
+ (binutils (assoc-ref %build-inputs "binutils"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (gcc (assoc-ref %build-inputs "gcc"))
+ (glibc (assoc-ref %build-inputs "libc"))
+ (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.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.6.4/include"
+ ":" kernel-headers
"/include"
+ ":" glibc "/include"
+ ":" (getcwd) "/mpfr/src"))
+ (setenv "LIBRARY_PATH" (string-append glibc "/lib"
+ ":" gcc "/lib"))
+ (format (current-error-port) "C_INCLUDE_PATH=~a\n"
(getenv "C_INCLUDE_PATH"))
+ (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n"
(getenv "CPLUS_INCLUDE_PATH"))
+ (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv
"LIBRARY_PATH"))
+ #t))))))))))
(define gcc-mesboot-wrapper
;; We need this so gcc-mesboot can be used to create shared binaries that
- 18/63: gnu: commencement: gcc-core-mesboot0: Use Gash instead of coretutils&co., (continued)
- 18/63: gnu: commencement: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/17
- 20/63: gnu: commencement: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2020/02/17
- 27/63: gnu: commencement: Add make-mesboot., guix-commits, 2020/02/17
- 28/63: gnu: commencement: Add gawk-mesboot., guix-commits, 2020/02/17
- 31/63: gnu: commencement: Add bash-mesboot., guix-commits, 2020/02/17
- 32/63: gnu: commencement: Add gcc-mesboot1: Use Gash instead of coreutils&co., guix-commits, 2020/02/17
- 35/63: gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/17
- 37/63: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/17
- 30/63: gnu: commencement: Add gcc-core-mesboot1., guix-commits, 2020/02/17
- 38/63: gnu: commencement: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/17
- 39/63: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co.,
guix-commits <=
- 41/63: gnu: commencement: Add coreutils-mesboot., guix-commits, 2020/02/17
- 42/63: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/17
- 49/63: gnu: commencement: Add coreutils-boot0., guix-commits, 2020/02/17
- 54/63: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2020/02/17
- 53/63: gnu: commencement: gnu-make-mesboot0: Rename from make-mesboot0., guix-commits, 2020/02/17
- 57/63: gnu: commencement: mes-boot: Update to 0.22., guix-commits, 2020/02/17
- 52/63: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2020/02/17
- 62/63: gnu: commencement: Remove %bootstrap-guile+guild., guix-commits, 2020/02/17
- 56/63: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix., guix-commits, 2020/02/17
- 60/63: Add (guix build gnu-bootstrap)., guix-commits, 2020/02/17