diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/commencement.scm | 58 |
1 files changed, 14 insertions, 44 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index babad13e5f..dfb9fee4c2 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") |