[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/70: bootstrap: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co
From: |
guix-commits |
Subject: |
53/70: bootstrap: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co. |
Date: |
Wed, 11 Dec 2019 13:04:48 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit cda7973b87085ceaf17929c6434b17c2b24986c4
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 22:27:22 2019 +0100
bootstrap: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (gcc-mesboot1-wrapper): Use Gash instead of
coreutils&co.
---
gnu/packages/commencement.scm | 115 +++++++++++++++++++++---------------------
1 file changed, 58 insertions(+), 57 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f96a5ac..ee4e8cb 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2388,63 +2388,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
(("^SUBDIRS = po") "SUBDIRS ="))
#t))))))))
-(define gcc-mesboot1-wrapper
- ;; We need this so gcc-mesboot1 can be used to create shared binaries that
- ;; have the correct interpreter, otherwise configuring gcc-mesboot using
- ;; --enable-shared will fail.
- (package
- (inherit gcc-mesboot1)
- (name "gcc-mesboot1-wrapper")
- (source #f)
- (inputs '())
- (native-inputs `(("bash" ,%bootstrap-coreutils&co)
- ("libc" ,glibc-mesboot)
- ("gcc" ,gcc-mesboot1)))
- (arguments
- `(#:implicit-inputs? #f
- #:guile ,%bootstrap-guile
- #:phases
- (modify-phases %standard-phases
- (delete 'unpack)
- (delete 'configure)
- (delete 'install)
- (replace 'build
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bash (assoc-ref %build-inputs "bash"))
- (libc (assoc-ref %build-inputs "libc"))
- (gcc (assoc-ref %build-inputs "gcc"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (for-each
- (lambda (program)
- (let ((wrapper (string-append bin "/" program)))
- (with-output-to-file wrapper
- (lambda _
- (display (string-append "#! " bash "/bin/bash
-exec " gcc "/bin/" program
-" -Wl,--dynamic-linker"
-;; also for x86_64-linux, we are still on i686-linux
-" -Wl," libc ,(glibc-dynamic-linker "i686-linux")
-" -Wl,--rpath"
-" -Wl," libc "/lib"
-" \"$@\"
-"))
- (chmod wrapper #o555)))))
- '(
- "gcc"
- "g++"
- "i686-unknown-linux-gnu-gcc"
- "i686-unknown-linux-gnu-g++"
- ))
- #t)))
- (replace 'check
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (program (string-append bin "/gcc")))
- (invoke program "--help")))))))))
-
(define (%boot-mesboot3-inputs)
`(("binutils" ,binutils-mesboot)
("xz" ,xz-mesboot)
@@ -2604,6 +2547,64 @@ SHELL := " shell "
`(("libc" ,glibc-mesboot)
,@(alist-delete "libc" (%boot-mesboot3-inputs))))
+(define gcc-mesboot1-wrapper
+ ;; We need this so gcc-mesboot1 can be used to create shared binaries that
+ ;; have the correct interpreter, otherwise configuring gcc-mesboot using
+ ;; --enable-shared will fail.
+ (package
+ (inherit gcc-mesboot1)
+ (name "gcc-mesboot1-wrapper")
+ (source #f)
+ (inputs '())
+ (native-inputs `(("bash" ,bash-mesboot)
+ ("coreutils" ,coreutils-mesboot0)
+ ("libc" ,glibc-mesboot)
+ ("gcc" ,gcc-mesboot1)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'unpack)
+ (delete 'configure)
+ (delete 'install)
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (libc (assoc-ref %build-inputs "libc"))
+ (gcc (assoc-ref %build-inputs "gcc"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (for-each
+ (lambda (program)
+ (let ((wrapper (string-append bin "/" program)))
+ (with-output-to-file wrapper
+ (lambda _
+ (display (string-append "#! " bash "/bin/bash
+exec " gcc "/bin/" program
+" -Wl,--dynamic-linker"
+;; also for x86_64-linux, we are still on i686-linux
+" -Wl," libc ,(glibc-dynamic-linker "i686-linux")
+" -Wl,--rpath"
+" -Wl," libc "/lib"
+" \"$@\"
+"))
+ (chmod wrapper #o555)))))
+ '("cpp"
+ "gcc"
+ "g++"
+ "i686-unknown-linux-gnu-cpp"
+ "i686-unknown-linux-gnu-gcc"
+ "i686-unknown-linux-gnu-g++"))
+ #t)))
+ (replace 'check
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (program (string-append bin "/gcc")))
+ (invoke program "--help")))))))))
+
(define gcc-mesboot
(package
(inherit gcc-mesboot1)
- 21/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., (continued)
- 21/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 28/70: bootstrap: Add patch-mesboot., guix-commits, 2019/12/11
- 37/70: bootstrap: Add grep-mesboot., guix-commits, 2019/12/11
- 33/70: bootstrap: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 31/70: bootstrap: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 44/70: bootstrap: Add bash-mesboot., guix-commits, 2019/12/11
- 30/70: bootstrap: binutils-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 41/70: bootstrap: Add gawk-mesboot., guix-commits, 2019/12/11
- 49/70: bootstrap: binutils-mesboot: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 50/70: bootstrap: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 53/70: bootstrap: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co.,
guix-commits <=
- 55/70: bootstrap: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 57/70: bootstrap: Remove m4-mesboot., guix-commits, 2019/12/11
- 29/70: bootstrap: Add sed-mesboot0., guix-commits, 2019/12/11
- 35/70: bootstrap: gcc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 36/70: bootstrap: Add tar-mesboot., guix-commits, 2019/12/11
- 39/70: bootstrap: Add coreutils-mesboot0., guix-commits, 2019/12/11
- 34/70: bootstrap: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 40/70: bootstrap: Add make-mesboot., guix-commits, 2019/12/11
- 45/70: bootstrap: Add gcc-mesboot1: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 48/70: bootstrap: Add hello-mesboot., guix-commits, 2019/12/11