[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/54: bootstrap: Add %bootstrap-gash. WIP
From: |
guix-commits |
Subject: |
06/54: bootstrap: Add %bootstrap-gash. WIP |
Date: |
Fri, 22 Nov 2019 18:17:39 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1808b5e30e80764863697a0622238961f83fe8f9
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Oct 28 01:24:28 2018 +0200
bootstrap: Add %bootstrap-gash. WIP
Built with
XXX5d2729d5be414669b11ab7242a4618059fe71b9e
XXXbootstrap: Add %guile-gash-stripped, %guile-gash-bootstrap-tarball.
* gnu/packages/bootstrap.scm (%bootstrap-gash): New variable.
---
gnu/packages/bootstrap.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index d6995f1..8503695 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
-;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
+;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
;;; Copyright © 2019 Carl Dong <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -49,6 +49,7 @@
bootstrap-guile-origin
%bootstrap-guile
+ %bootstrap-gash
%bootstrap-coreutils&co
%bootstrap-linux-libre-headers
%bootstrap-binutils
@@ -805,6 +806,71 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
(home-page #f)
(license gpl3+)))
+(define %bootstrap-gash
+ ;; The initial Gash. Uses .go files from a tarball typically built by
+ ;; %GASH-BOOTSTRAP-GUILE-TARBALL.
+ (package
+ (name "bootstrap-gash")
+ (version "36")
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils)
+ (ice-9 match)
+ (ice-9 popen))
+ (let ((out (assoc-ref %outputs "out"))
+ (guile (assoc-ref %build-inputs "guile"))
+ (tar (assoc-ref %build-inputs "tar"))
+ (xz (assoc-ref %build-inputs "xz"))
+ (tarball (assoc-ref %build-inputs "tarball")))
+
+ (mkdir out)
+ (copy-file tarball "binaries.tar.xz")
+ (invoke xz "-d" "binaries.tar.xz")
+ (let ((build (getcwd))
+ (bin (string-append out "/bin")))
+
+ (define (rewire-script script)
+ (substitute* script
+ (("/gnu/store/[^ ]*guile-bootstrap[^/]*") guile)
+ (("/gnu/store/[^ ]*gash-bootstrap[^/]*") out)))
+
+ (with-directory-excursion out
+ (invoke tar "xvf"
+ (string-append build "/binaries.tar")))
+ (chmod bin #o755)
+ (for-each rewire-script (find-files bin)))))))
+ (inputs
+ `(("guile" ,%bootstrap-guile)
+ ("tar" ,(bootstrap-executable "tar" (%current-system)))
+ ("xz" ,(bootstrap-executable "xz" (%current-system)))
+ ("tarball" ,(bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://lilypond.org/janneke/mes/"
+ (match (%current-system)
+ ("x86_64-linux"
+
"gash-bootstrap-guile-0.1-9.32188ac-x86_64-linux.tar.xz")
+ ("i686-linux"
+
"gash-bootstrap-guile-0.1-9.32188ac-i686-linux.tar.xz"))))
+ (sha256
+ (base32
+ (match (%current-system)
+ ("x86_64-linux"
+
"0kwdcryg5all9lxf9h31cv0lzb3yn9cfpxchiwpfdzyx8jkclb3r")
+ ("i686-linux"
+
"13b27pcc7mc4g664971bjwjp56dzaqijwh7yfr89kym6v892fb8f")))))))))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (synopsis "Bootstrap binaries of Gash")
+ (description synopsis)
+ (home-page #f)
+ (license gpl3+)))
+
(define (%bootstrap-inputs)
;; The initial, pre-built inputs. From now on, we can start building our
;; own packages.
- branch wip-bootstrap created (now d3fc856), guix-commits, 2019/11/22
- 01/54: gnu: Add ncompress., guix-commits, 2019/11/22
- 05/54: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-tarball., guix-commits, 2019/11/22
- 02/54: gnu: Add gash-core-utils., guix-commits, 2019/11/22
- 07/54: gnu: mes: Update to 0.21 WIP, guix-commits, 2019/11/22
- 04/54: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/11/22
- 03/54: bootstrap: Add gash-boot., guix-commits, 2019/11/22
- 10/54: bootstrap: bootstrap-mescc-tools: Update for mescc-tools-0.6.1., guix-commits, 2019/11/22
- 09/54: bootstrap: mes-minimal: Update for mes-0.20., guix-commits, 2019/11/22
- 08/54: bootstrap: mescc-tools-static: Update for mescc-tools-0.6.1., guix-commits, 2019/11/22
- 06/54: bootstrap: Add %bootstrap-gash. WIP,
guix-commits <=
- 12/54: bootstrap: nyacc-boot. WIP, guix-commits, 2019/11/22
- 13/54: bootstrap-gash-rewire? WIP, guix-commits, 2019/11/22
- 15/54: bootstrap: tcc-boot0: Scheme-only bootstrap. WIP, guix-commits, 2019/11/22
- 14/54: bootstrap: mes-boot: Scheme-only bootstrap. WIP, guix-commits, 2019/11/22
- 11/54: bootstrap: bootstrap-mes: Update for mes-0.21. WIP, guix-commits, 2019/11/22
- 16/54: bootstrap: Add gzip-mesboot0., guix-commits, 2019/11/22
- 19/54: bootstrap: Add bash-mesboot0., guix-commits, 2019/11/22
- 17/54: bootstrap: make-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 22/54: bootstrap: Add patch-mesboot0., guix-commits, 2019/11/22
- 24/54: bootstrap: binutils-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22