[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/16: commencement: WIP
From: |
guix-commits |
Subject: |
14/16: commencement: WIP |
Date: |
Fri, 30 Nov 2018 13:21:51 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8e8019c32aff84feb330c812f3511d59273371b9
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 30 12:41:43 2018 +0100
commencement: WIP
---
gnu/packages/commencement.scm | 49 ++++++++++++++++++++++++++++++-------------
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8e4489e..f4834cb 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -130,10 +130,10 @@
(method url-fetch)
(uri (string-append
"http://lilypond.org/janneke/mes/"
-
"mes-865b2f682a1934f2c75631d7b588600a1079a0ee.tar.Z"))
+
"mes-43a93cfe4863bc5a49776401002011c82071f0e6.tar.Z"))
(sha256
(base32
-
"0wd847xi0hnnx9q65f10yyi17a9ixyyl4z6a8hxm2qa50rk8dxzi")))))
+
"0lpbqrs1brkxnb7ksn8dnkp0j468p4bvmkpxvq44l00gxghikrmb")))))
(native-inputs '())
(propagated-inputs '()))))
@@ -306,6 +306,7 @@
(lambda _
(let ((gash (assoc-ref %build-inputs "gash")))
(setenv "PATH" (string-append gash "/libexec/gash:" (getenv
"PATH")))
+ (format #t "PATH=~s\n" (getenv "PATH"))
#t)))
(add-after 'unpack 'unpack-seeds
(lambda* (#:key outputs #:allow-other-keys)
@@ -348,34 +349,52 @@
#t)))
(replace 'build
(lambda _
+ ;; (substitute* "bootstrap.sh"
+ ;; (("guile build-aux/mes-snarf.scm (.*)" all cmd)
+ ;; (string-append "echo guile -e '(mes-snarf)'
build-aux/mes-snarf.scm " cmd "\n"
+ ;; "guile -e '(mes-snarf)'
build-aux/mes-snarf.scm " cmd "\n"
+ ;; "ls -l src\n"
+ ;; ))
+ ;; (("guile --no-auto-compile (.*)" all cmd)
+ ;; (string-append "echo guile " cmd "\n"
+ ;; "guile " cmd "\n"
+ ;; "ls -l lib lib/x86-mes src\n"
+ ;; ))
+ ;; )
+ ;; (system* "guile" "-e" "(mes-snarf)" "build-aux/mes-snarf.scm"
"--mes" "src/gc.c")
+ ;; ;;(invoke "sh" "-x" "bootstrap.sh")
+
(substitute* "bootstrap.sh"
(("guile build-aux/mes-snarf.scm (.*)" all cmd)
(string-append "echo guile -e '(mes-snarf)'
build-aux/mes-snarf.scm " cmd "\n"
"guile -e '(mes-snarf)'
build-aux/mes-snarf.scm " cmd "\n"
"ls -l src\n"
))
- (("guile --no-auto-compile (.*)" all cmd)
+ (("guile (.*)" all cmd)
(string-append "echo guile " cmd "\n"
"guile " cmd "\n"
"ls -l lib lib/x86-mes src\n"
))
)
- (system* "guile" "-e" "(mes-snarf)" "build-aux/mes-snarf.scm"
"--mes" "src/gc.c")
- ;;(invoke "sh" "-x" "bootstrap.sh")
- (system* "sh" "-x" "bootstrap.sh")
- (system* "ls" "-l" "src")
- (format #t "***************************************\n")
- (system* "guile" "-e" "main" "-L" "module" "scripts/mescc.scm"
"-c" "-D" "VERSION=\"0.18\"" "-D"
"MODULEDIR=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
"-D"
"PREFIX=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1\""
"-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L"
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o"
"lib/libc+tcc.x86-mes-o" "lib/libc+tcc.c")
- (system* "ls" "-l" "lib")
- (system* "ls" "-l" "lib/x86-mes")
- (system* "guile" "-e" "main" "-L" "module" "scripts/mescc.scm"
"-c" "-D" "VERSION=\"0.18\"" "-D"
"MODULEDIR=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
"-D"
"PREFIX=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1\""
"-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L"
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o"
"src/mes.x86-mes-o" "src/mes.c")
- (system* "ls" "-l" "src")
+
+ (system* "sh" "-x" "bootstrap.sh")
+
+ ;; (system* "ls" "-l" "src")
+ ;; (format #t "***************************************\n")
+ ;; (system* "guile" "-e" "main" "-L" "module"
"scripts/mescc.scm" "-c" "-D" "VERSION=\"0.18\"" "-D"
"MODULEDIR=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
"-D"
"PREFIX=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1\""
"-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L"
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o"
"lib/libc+tcc.x86-mes-o" "lib/libc+tcc.c")
+ ;; (system* "ls" "-l" "lib")
+ ;; (system* "ls" "-l" "lib/x86-mes")
+ ;; (system* "guile" "-e" "main" "-L" "module"
"scripts/mescc.scm" "-c" "-D" "VERSION=\"0.18\"" "-D"
"MODULEDIR=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
"-D"
"PREFIX=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1\""
"-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L"
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o"
"src/mes.x86-mes-o" "src/mes.c")
+ ;; (system* "ls" "-l" "src")
#t))
+ (replace 'check
+ (lambda _
+ (invoke "src/mes" "--help")))
(replace 'install
(lambda _
- ;;(invoke "sh" "-x" "install.sh")
- (throw 'barf)
+ (invoke "sh" "-x" "install.sh")
+ ;;(throw 'barf)
)))))
(native-search-paths
;; Use the language-specific variables rather than 'CPATH' because they
- branch wip-bootstrap created (now c9e273f), guix-commits, 2018/11/30
- 11/16: mes-boot1: build with gash, guix-commits, 2018/11/30
- 02/16: bootstrap: Use x86_64-linux bootstrap tarballs for x86_64-linux., guix-commits, 2018/11/30
- 05/16: bootstrap: mes-minimal: Update for 0.19, guix-commits, 2018/11/30
- 08/16: bootstrap: Update %bootstrap-guile to 2.2., guix-commits, 2018/11/30
- 12/16: pieton: HAK, guix-commits, 2018/11/30
- 14/16: commencement: WIP,
guix-commits <=
- 16/16: commencement: built mes-boot1!, guix-commits, 2018/11/30
- 01/16: bootstrap: mes-boot: Use mes-boot0 version., guix-commits, 2018/11/30
- 09/16: bootstrap: Add %bootstrap-gash. WIP, guix-commits, 2018/11/30
- 10/16: bootstrap: Add make-mesboot1. WIP, guix-commits, 2018/11/30
- 06/16: gnu: Add gash., guix-commits, 2018/11/30
- 04/16: boot, guix-commits, 2018/11/30
- 03/16: mes: Update to 0.19. WIP, guix-commits, 2018/11/30
- 07/16: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball., guix-commits, 2018/11/30
- 15/16: commencement: first installed mes-boot1 --still fu, guix-commits, 2018/11/30
- 13/16: mes-boot1: WIP -- works with subst, guix-commits, 2018/11/30