TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bootstrap: Add %mes-stripped, %mes-bootstrap-tarball.

Browse source 
* 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.
This commit is contained in:
Jan Nieuwenhuizen 2018-10-20 08:59:19 +02:00
parent f266199dc1
commit 35dcf85157
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/make-bootstrap.scm
View file

@ -38,6 +38,7 @@ (define-module (gnu packages make-bootstrap)
#:use-module (gnu packages libunistring) #:use-module (gnu packages libunistring)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages mes)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -47,6 +48,7 @@ (define-module (gnu packages make-bootstrap)
%glibc-bootstrap-tarball %glibc-bootstrap-tarball
%gcc-bootstrap-tarball %gcc-bootstrap-tarball
%guile-bootstrap-tarball %guile-bootstrap-tarball
%mes-bootstrap-tarball
%bootstrap-tarballs %bootstrap-tarballs
%guile-static-stripped)) %guile-static-stripped))
@ -533,6 +535,35 @@ (define %gcc-stripped
#t)))) #t))))
(inputs `(("gcc" ,%gcc-static))))) (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 (define %guile-static
;; A statically-linked Guile that is relocatable--i.e., it can search ;; A statically-linked Guile that is relocatable--i.e., it can search
;; .scm and .go files relative to its installation directory, rather ;; .scm and .go files relative to its installation directory, rather
@ -700,6 +731,10 @@ (define %guile-bootstrap-tarball
;; A tarball with the statically-linked, relocatable Guile. ;; A tarball with the statically-linked, relocatable Guile.
(tarball-package %guile-static-stripped)) (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 (define %bootstrap-tarballs
;; A single derivation containing all the bootstrap tarballs, for ;; A single derivation containing all the bootstrap tarballs, for
;; convenience. ;; convenience.

1
gnu/packages/mes.scm
View file

@ -21,7 +21,6 @@
(define-module (gnu packages mes) (define-module (gnu packages mes)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages commencement)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)