[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: mes-boot: Update to 0.14.
From: |
Jan Nieuwenhuizen |
Subject: |
02/04: gnu: mes-boot: Update to 0.14. |
Date: |
Thu, 24 May 2018 01:49:34 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit d882f3741ea6db59e3a7040c263ea0d704dd252f
Author: Jan Nieuwenhuizen <address@hidden>
Date: Thu May 3 12:00:33 2018 +0200
gnu: mes-boot: Update to 0.14.
* gnu/packages/mes.scm (mes-boot): Update to 0.14.
---
gnu/packages/mes.scm | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 09f8848..9ddc46f 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -217,9 +217,9 @@ hex2 linker.")
(license gpl3+)))))
(define-public mes-boot
- (let ((version "0.13")
+ (let ((version "0.14")
(revision "0")
- (commit "9aa04a854940aec2683c1cc62205cea6da6f02a2"))
+ (commit "4e50490aa2513ced5b568f434b23ba36218ba7b3"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -232,7 +232,7 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "065vlpjpwnzv7h7my39zb0f7bk2zrsh08g4m7si6p7m0330n3x2z"))))
+ "0ydsmkqb0sm1rhh83r0kyqv7664iw1ginvd52gp11mx7317qaldk"))))
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -279,6 +279,8 @@ hex2 linker.")
(mkdir-p "srfi")
(system* "cp" srfi-43 "srfi/srfi-43.scm")
(chdir "source")
+
+ ;; configure
(setenv "PREFIX" out)
(when guile
(setenv "GUILE_AUTO_COMPILE" "1")
@@ -288,24 +290,32 @@ hex2 linker.")
(string-append "../nyacc-source/module"
":" dir
":" guile "/share/guile/2.0/")))
+
+ ;; guile-2.0 fails
+ (delete-file "tests/srfi-43.test-guile")
+
;; give auto-compile a home -- massive speed-up
(mkdir-p "/tmp/home")
(setenv "HOME" "/tmp/home")
+
+ (when (not guile)
+ (symlink (string-append "../nyacc-source/module") "nyacc")
+ (setenv "GUILE_LOAD_PATH" "nyacc")
+ (setenv "MES" "src/mes")
+ (setenv "GUILE" "true"))
+ (setenv "MESCC" "scripts/mescc")
+ (setenv "MES_MODULEDIR" "module")
(and
+ ;; build
(zero? (system* "sh" "build.sh"))
- (and
- (symlink (string-append "../nyacc-source/module") "nyacc")
- ;; guile-2.0 fails
- (delete-file "tests/srfi-43.test-guile")
- (when (not guile)
- (setenv "GUILE" "true"))
- (setenv "GUILE_LOAD_PATH" "nyacc")
- (setenv "MES" "src/mes")
- (setenv "MES_MODULEDIR" "module")
- (setenv "MESCC" "scripts/mescc")
- (zero? (system* "sh" "-x" "test.sh"))
- (zero? (system* "sh" "-x" "test.sh" "63-struct-cell"))
- (zero? (system* "sh" "check.sh")))
+
+ ;; check
+ (zero? (system* "sh" "-x" "build-aux/test.sh"))
+ (zero? (system* "sh" "-x" "build-aux/test.sh"
"scaffold/tests/63-struct-cell"))
+ (zero? (system* "sh" "check.sh"))
+
+ ;; install
+ (setenv "SHELL" (string-append bash "/bin/bash"))
(zero? (system* "sh" "install.sh")))))))
(description
"Mes [Maxwell Equations of Software] aims to create full source