[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
61/64: Add (guix build gnu-bootstrap).
From: |
guix-commits |
Subject: |
61/64: Add (guix build gnu-bootstrap). |
Date: |
Tue, 18 Feb 2020 01:18:18 -0500 (EST) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 9c9407f746aa6ad365c0604ef9668009f4dbe8fd
Author: Timothy Sample <address@hidden>
AuthorDate: Sat Feb 8 09:57:21 2020 -0500
Add (guix build gnu-bootstrap).
* guix/build/gnu-bootstrap.scm: New file.
* Makefile.am (MODULES): Add it.
---
Makefile.am | 1 +
guix/build/gnu-bootstrap.scm | 114 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index c6a2e6c..0371d92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,6 +172,7 @@ MODULES = \
guix/build/git.scm \
guix/build/hg.scm \
guix/build/glib-or-gtk-build-system.scm \
+ guix/build/gnu-bootstrap.scm \
guix/build/gnu-build-system.scm \
guix/build/gnu-dist.scm \
guix/build/guile-build-system.scm \
diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm
new file mode 100644
index 0000000..1cb9dc5
--- /dev/null
+++ b/guix/build/gnu-bootstrap.scm
@@ -0,0 +1,114 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Timothy Sample <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+;; Commentary:
+;;
+;; These procedures can be used to adapt the GNU Build System to build
+;; pure Scheme packages targeting the bootstrap Guile.
+;;
+;; Code:
+
+(define-module (guix build gnu-bootstrap)
+ #:use-module (guix build utils)
+ #:use-module (system base compile)
+ #:export (bootstrap-configure
+ bootstrap-build
+ bootstrap-install))
+
+(define (bootstrap-configure version modules scripts)
+ "Create a procedure that configures an early bootstrap package. The
+procedure will search the MODULES directory and configure all of the
+'.in' files with VERSION. It will then search the SCRIPTS directory and
+configure all of the '.in' files with the bootstrap Guile and its module
+and object directories."
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (guile-dir (assoc-ref inputs "guile"))
+ (guile (string-append guile-dir "/bin/guile"))
+ (moddir (string-append out "/share/guile/site/"
+ (effective-version)))
+ (godir (string-append out "/lib/guile/"
+ (effective-version)
+ "/site-ccache")))
+ (for-each (lambda (template)
+ (format #t "Configuring ~a~%" template)
+ (let ((target (string-drop-right template 3)))
+ (copy-file template target)
+ (substitute* target
+ (("@VERSION@") version))))
+ (find-files modules
+ (lambda (fn st)
+ (string-suffix? ".in" fn))))
+ (for-each (lambda (template)
+ (format #t "Configuring ~a~%" template)
+ (let ((target (string-drop-right template 3)))
+ (copy-file template target)
+ (substitute* target
+ (("@GUILE@") guile)
+ (("@MODDIR@") moddir)
+ (("@GODIR@") godir))
+ (chmod target #o755)))
+ (find-files scripts
+ (lambda (fn st)
+ (string-suffix? ".in" fn))))
+ #t)))
+
+(define (bootstrap-build modules)
+ "Create a procedure that builds an early bootstrap package. The
+procedure will search the MODULES directory and compile all of the
+'.scm' files."
+ (lambda _
+ (add-to-load-path (getcwd))
+ (for-each (lambda (scm)
+ (let* ((base (string-drop-right scm 4))
+ (go (string-append base ".go"))
+ (dir (dirname scm)))
+ (format #t "Compiling ~a~%" scm)
+ (compile-file scm #:output-file go)))
+ (find-files modules "\\.scm$"))
+ #t))
+
+(define (bootstrap-install modules scripts)
+ "Create a procedure that installs an early bootstrap package. The
+procedure will install all of the '.scm' and '.go' files in the MODULES
+directory, and all the executable files in the SCRIPTS directory."
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (guile-dir (assoc-ref inputs "guile"))
+ (guile (string-append guile-dir "/bin/guile"))
+ (moddir (string-append out "/share/guile/site/"
+ (effective-version)))
+ (godir (string-append out "/lib/guile/"
+ (effective-version)
+ "/site-ccache")))
+ (for-each (lambda (scm)
+ (let* ((base (string-drop-right scm 4))
+ (go (string-append base ".go"))
+ (dir (dirname scm)))
+ (format #t "Installing ~a~%" scm)
+ (install-file scm (string-append moddir "/" dir))
+ (format #t "Installing ~a~%" go)
+ (install-file go (string-append godir "/" dir))))
+ (find-files modules "\\.scm$"))
+ (for-each (lambda (script)
+ (format #t "Installing ~a~%" script)
+ (install-file script (string-append out "/bin")))
+ (find-files scripts
+ (lambda (fn st)
+ (executable-file? fn))))
+ #t)))
- 29/64: gnu: commencement: Add sed-mesboot., (continued)
- 29/64: gnu: commencement: Add sed-mesboot., guix-commits, 2020/02/18
- 33/64: gnu: commencement: Add xz-mesboot., guix-commits, 2020/02/18
- 34/64: gnu: commencement: Add hello-mesboot., guix-commits, 2020/02/18
- 38/64: gnu: commencement: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 39/64: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 42/64: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/18
- 45/64: gnu: commencement: Add gawk-boot0., guix-commits, 2020/02/18
- 36/64: gnu: commencement: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 40/64: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 41/64: gnu: commencement: Add coreutils-mesboot., guix-commits, 2020/02/18
- 61/64: Add (guix build gnu-bootstrap).,
guix-commits <=
- 47/64: gnu: commencement: Add patch-boot0., guix-commits, 2020/02/18
- 44/64: gnu: commencement: file: Build file without bzip2., guix-commits, 2020/02/18
- 48/64: gnu: commencement: Add bzip2-boot0., guix-commits, 2020/02/18
- 49/64: gnu: commencement: Add tar-boot0., guix-commits, 2020/02/18
- 50/64: gnu: commencement: Add coreutils-boot0., guix-commits, 2020/02/18
- 53/64: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2020/02/18
- 59/64: gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only., guix-commits, 2020/02/18
- 62/64: gnu: commencement: Simplify Gash and Gash-Utils., guix-commits, 2020/02/18
- 64/64: gnu: commencement: Fix '%boot-mesboot1-inputs'., guix-commits, 2020/02/18
- 63/64: gnu: commencement: Remove %bootstrap-guile+guild., guix-commits, 2020/02/18