[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: bootstrap: Add %mes-stripped, %mes-bootstrap-tarball.
From: |
Jan Nieuwenhuizen |
Subject: |
04/09: bootstrap: Add %mes-stripped, %mes-bootstrap-tarball. |
Date: |
Tue, 23 Oct 2018 17:00:34 -0400 (EDT) |
janneke pushed a commit to branch core-updates-next
in repository guix.
commit 35dcf85157435be848bc03bc014bdf5eb18546e6
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Oct 20 08:59:19 2018 +0200
bootstrap: Add %mes-stripped, %mes-bootstrap-tarball.
* gnu/packages/make-bootstrap.scm (%mes-stripped): New variable.
(%mes-bootstrap-tarball): New variable.
* gnu/packages/mes.scm: Oops, remove stray (gnu packages commencement)
module
include.
---
gnu/packages/make-bootstrap.scm | 35 +++++++++++++++++++++++++++++++++++
gnu/packages/mes.scm | 1 -
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 3553737..7bfba3c 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages libunistring)
#:use-module (gnu packages linux)
#:use-module (gnu packages hurd)
+ #:use-module (gnu packages mes)
#:use-module (gnu packages multiprecision)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
@@ -47,6 +48,7 @@
%glibc-bootstrap-tarball
%gcc-bootstrap-tarball
%guile-bootstrap-tarball
+ %mes-bootstrap-tarball
%bootstrap-tarballs
%guile-static-stripped))
@@ -533,6 +535,35 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
#t))))
(inputs `(("gcc" ,%gcc-static)))))
+(define %mes-stripped
+ ;; The subset of Mes files needed for bootstrap.
+ (package
+ (inherit mes)
+ (name "mes-stripped")
+ (build-system trivial-build-system)
+ (source #f)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build utils))
+
+ (setvbuf (current-output-port) _IOLBF)
+ (let* ((out (assoc-ref %outputs "out"))
+ (libdir (string-append out "/lib"))
+ (mes (assoc-ref %build-inputs "mes")))
+
+ (copy-recursively (string-append mes "/lib") libdir)
+ (copy-recursively (string-append mes "/share/mes/lib") libdir)
+ (for-each remove-store-references
+ (remove (lambda (file) (or (string-suffix? ".h" file)
+ (string-suffix? ".c" file)))
+ (find-files out ".*")))
+ #t))))
+ (inputs `(("mes" ,mes)))))
+
(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
@@ -700,6 +731,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 %mes-bootstrap-tarball
+ ;; A tarball with Mes ASCII Seed and binary Mes C Library.
+ (tarball-package %mes-stripped))
+
(define %bootstrap-tarballs
;; A single derivation containing all the bootstrap tarballs, for
;; convenience.
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 4f98cd2..c4cb118 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -21,7 +21,6 @@
(define-module (gnu packages mes)
#:use-module (gnu packages)
#:use-module (gnu packages base)
- #:use-module (gnu packages commencement)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz)
- branch core-updates-next updated (09c5a56 -> d0bb7ed), Jan Nieuwenhuizen, 2018/10/23
- 04/09: bootstrap: Add %mes-stripped, %mes-bootstrap-tarball.,
Jan Nieuwenhuizen <=
- 03/09: gnu: mes: Update to 0.18.0-08f04f55., Jan Nieuwenhuizen, 2018/10/23
- 02/09: doc: Move `Reduced Binary Seed Bootstrap' into `Bootstrapping'., Jan Nieuwenhuizen, 2018/10/23
- 06/09: bootstrap: Add %bootstrap-mes., Jan Nieuwenhuizen, 2018/10/23
- 09/09: doc: Update Preparing to Use the Bootstrap Binaries., Jan Nieuwenhuizen, 2018/10/23
- 01/09: Merge branch 'core-updates' into core-updates-next, Jan Nieuwenhuizen, 2018/10/23
- 08/09: bootstrap: Build with %bootstrap-mes., Jan Nieuwenhuizen, 2018/10/23
- 05/09: bootstrap: Move use-modules to top of builder., Jan Nieuwenhuizen, 2018/10/23
- 07/09: gnu: mescc-tools: Update to 0.5.2-0.bb062b0d., Jan Nieuwenhuizen, 2018/10/23