[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: bootstrap: mes-boot: Update for mes 0.19.
From: |
guix-commits |
Subject: |
11/13: bootstrap: mes-boot: Update for mes 0.19. |
Date: |
Thu, 20 Dec 2018 06:22:50 -0500 (EST) |
janneke pushed a commit to branch core-updates
in repository guix.
commit df2242a462559d57b1362793f50667a81b2475d3
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Dec 16 21:16:29 2018 +0100
bootstrap: mes-boot: Update for mes 0.19.
* gnu/packages/commencement.scm (mes-boot): Update for mes 0.19.
(mes-boot0): Remove.
---
gnu/packages/commencement.scm | 58 +++++++++++--------------------------------
1 file changed, 14 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index babad13..dfb9fee 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -81,36 +81,11 @@
;;;
;;; Code:
-(define mes-boot0
- (let ((version "0.18")
- (revision "1")
- (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd"))
- (package
- (inherit mes)
- (name "mes-boot0")
- (version (if commit (string-append version "-" revision "." (string-take
commit 7))
- version))
- (source (if commit
- (origin
- (method url-fetch)
- (uri (string-append
- "https://git.savannah.gnu.org/cgit/mes.git/snapshot/"
- "mes" "-" commit
- ".tar.gz"))
- (sha256
- (base32
- "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn")))
- (package-source mes)))
- (native-inputs '())
- (propagated-inputs '()))))
-
(define mes-boot
(package-with-bootstrap-guile
(package
(inherit mes)
(name "mes-boot")
- (version (package-version mes-boot0))
- (source (package-source mes-boot0))
(inputs '())
(propagated-inputs '())
(native-inputs
@@ -126,40 +101,35 @@
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-seeds
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((coreutils (assoc-ref %build-inputs "coreutils"))
- (srfi-43 (assoc-ref %build-inputs "srfi-43"))
- (nyacc-source (assoc-ref %build-inputs "nyacc-source"))
+ (lambda _
+ (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source"))
(bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes")))
(with-directory-excursion ".."
(and
(mkdir-p "nyacc-source")
(invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf"
nyacc-source)
- (symlink (string-append bootstrap-mes "/lib") "mes-seed")
- (or (not srfi-43)
- (and (mkdir-p "srfi")
- (copy-file srfi-43 "srfi/srfi-43.scm")
- #t)))))))
+ (symlink (string-append bootstrap-mes "/share/mes/lib")
"mes-seed")
+ #t)))))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref %outputs "out")))
- (symlink (string-append "../nyacc-source/module") "nyacc")
+ (setenv "GUILE" "mes")
+ (setenv "GUILE_EFFECTIVE_VERSION" "2.2")
(setenv "GUILE_LOAD_PATH" "nyacc")
- (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile
- (substitute* "configure.sh"
- (("^arch=.*") "arch=i686\n"))
+ (symlink (string-append "../nyacc-source/module") "nyacc")
(invoke "bash" "configure.sh"
- (string-append "--prefix=" out))
- (setenv "MES" "src/mes")
- (setenv "MESCC" "scripts/mescc")
- #t)))
+ (string-append "--prefix=" out)))))
(replace 'build
(lambda _
- (invoke "sh" "build.sh")))
+ (let ((mes (assoc-ref %build-inputs "bootstrap-mes")))
+ (setenv "MES_PREFIX" (string-append mes "/share/mes"))
+ (setenv "MES_ARENA" "100000000")
+ (setenv "MES_MAX_ARENA" "100000000")
+ (setenv "MES_STACK" "10000000")
+ (invoke "sh" "bootstrap.sh"))))
(replace 'check
(lambda _
(and
- (setenv "MES_ARENA" "100000000")
(setenv "DIFF" "sh scripts/diff.scm")
;; fail fast tests
;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t")
- branch core-updates updated (fafa789 -> 03a45a4), guix-commits, 2018/12/20
- 01/13: bootstrap: mes-minimal-stripped: Do not strip bin., guix-commits, 2018/12/20
- 02/13: gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd., guix-commits, 2018/12/20
- 03/13: bootstrap: bootstrap-mes: Update., guix-commits, 2018/12/20
- 06/13: bootstrap: Remove development hacks., guix-commits, 2018/12/20
- 08/13: bootstrap: Merge mes-minimal into mes-minimal-stripped., guix-commits, 2018/12/20
- 10/13: bootstrap: bootstrap-mes: Update., guix-commits, 2018/12/20
- 04/13: bootstrap: Do not fake, use Mes instead of Guile., guix-commits, 2018/12/20
- 11/13: bootstrap: mes-boot: Update for mes 0.19.,
guix-commits <=
- 07/13: gnu: mes: Update to 0.19., guix-commits, 2018/12/20
- 12/13: bootstrap: tcc-boot0: Update for mes 0.19., guix-commits, 2018/12/20
- 05/13: doc: Update mesboot graph without bootstrap-guile., guix-commits, 2018/12/20
- 09/13: bootstrap: Add mes-boot0; decouple mes-boot from Mes., guix-commits, 2018/12/20
- 13/13: bootstrap: srfi-43: Remove., guix-commits, 2018/12/20