[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/16: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarba
From: |
guix-commits |
Subject: |
07/16: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball. |
Date: |
Fri, 30 Nov 2018 13:21:48 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8273f1f65af6855b8b60c1434151a8a13dd58326
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Oct 28 01:14:00 2018 +0200
bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball.
* gnu/packages/make-bootstrap.scm (%gash-bootstrap-guile): New variable.
(%gash-bootstrap-guile-tarball): New variable.
---
gnu/packages/make-bootstrap.scm | 42 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 62456b0..6c73bc1 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -48,6 +48,7 @@
%glibc-bootstrap-tarball
%gcc-bootstrap-tarball
%guile-bootstrap-tarball
+ %gash-bootstrap-guile-tarball
%mescc-tools-bootstrap-tarball
%mes-bootstrap-tarball
%bootstrap-tarballs
@@ -589,6 +590,43 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
#t))))
(inputs `(("mes" ,%mes-minimal)))))
+(define %gash-bootstrap-guile
+ ;; Gash with %bootstrap-guile she-bangs.
+ (package
+ (inherit guile-gash)
+ (name "gash-bootstrap-guile")
+ (build-system trivial-build-system)
+ (source #f)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (srfi srfi-1)
+ (guix build utils))
+
+ (setvbuf (current-output-port) _IOLBF)
+ (let* ((out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin"))
+ (libexec (string-append out "/libexec/gash"))
+ (gash (assoc-ref %build-inputs "gash"))
+ (guile (assoc-ref %build-inputs "guile"))
+ (bootstrap-guile (assoc-ref %build-inputs "bootstrap-guile")))
+
+ (define (rewire-script script)
+ (substitute* script
+ ((gash) out)
+ ((guile) bootstrap-guile)
+ (("bin/guile") "bin/.guile-real")))
+
+ (copy-recursively gash out)
+ (for-each rewire-script (append (find-files bin)
+ (find-files libexec)))
+
+ #t))))
+ (inputs `(("guile" ,guile-2.2)
+ ("bootstrap-guile" ,(@ (gnu packages bootstrap)
%bootstrap-guile))
+ ("gash" ,guile-gash)))))
+
(define %guile-static
;; A statically-linked Guile that is relocatable--i.e., it can search
;; .scm and .go files relative to its installation directory, rather
@@ -756,6 +794,10 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
;; A tarball with the statically-linked, relocatable Guile.
(tarball-package %guile-static-stripped))
+(define %gash-bootstrap-guile-tarball
+ ;; A tarball with Gash, built with %bootstrap-guile.
+ (tarball-package %gash-bootstrap-guile))
+
(define %mescc-tools-bootstrap-tarball
;; A tarball with MesCC binary seed.
(tarball-package %mescc-tools-static))
- 08/16: bootstrap: Update %bootstrap-guile to 2.2., (continued)
- 08/16: bootstrap: Update %bootstrap-guile to 2.2., guix-commits, 2018/11/30
- 12/16: pieton: HAK, guix-commits, 2018/11/30
- 14/16: commencement: WIP, guix-commits, 2018/11/30
- 16/16: commencement: built mes-boot1!, guix-commits, 2018/11/30
- 01/16: bootstrap: mes-boot: Use mes-boot0 version., guix-commits, 2018/11/30
- 09/16: bootstrap: Add %bootstrap-gash. WIP, guix-commits, 2018/11/30
- 10/16: bootstrap: Add make-mesboot1. WIP, guix-commits, 2018/11/30
- 06/16: gnu: Add gash., guix-commits, 2018/11/30
- 04/16: boot, guix-commits, 2018/11/30
- 03/16: mes: Update to 0.19. WIP, guix-commits, 2018/11/30
- 07/16: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball.,
guix-commits <=
- 15/16: commencement: first installed mes-boot1 --still fu, guix-commits, 2018/11/30
- 13/16: mes-boot1: WIP -- works with subst, guix-commits, 2018/11/30