[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/15: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarba
From: |
guix-commits |
Subject: |
08/15: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball. |
Date: |
Wed, 5 Dec 2018 16:57:53 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f59c87e18bb6d41dc09ed8f7ef751e1063d7fd98
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 77ab443..3a629ec 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
@@ -596,6 +597,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
@@ -763,6 +801,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))
- 05/15: mes-minimal-stripped, (continued)
- 05/15: mes-minimal-stripped, guix-commits, 2018/12/05
- 03/15: mes: Update to 0.19. WIP, guix-commits, 2018/12/05
- 06/15: bootstrap-mes: Update., guix-commits, 2018/12/05
- 02/15: bootstrap: Use x86_64-linux bootstrap tarballs for x86_64-linux., guix-commits, 2018/12/05
- 09/15: bootstrap: Update %bootstrap-guile to 2.2., guix-commits, 2018/12/05
- 07/15: gnu: Add gash. WIP, guix-commits, 2018/12/05
- 11/15: bootstrap: mes-boot: Scheme-only bootstrap. WIP, guix-commits, 2018/12/05
- 12/15: bootstrap: tcc-boot0: Scheme-only bootstrap. WIP, guix-commits, 2018/12/05
- 14/15: pieton: HAK, guix-commits, 2018/12/05
- 10/15: bootstrap: Add %bootstrap-gash. WIP, guix-commits, 2018/12/05
- 08/15: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball.,
guix-commits <=
- 13/15: bootstrap: make-mesboot0: Scheme-only bootstrap. WIP, guix-commits, 2018/12/05
- 15/15: doc: update gcc-mesboot-bag-graph.dot, guix-commits, 2018/12/05