janneke pushed a commit to branch wip-full-source-bootstrap in repository guix.
commit c5af8bb5972774c83efadf830c27d87dd1a027b1 Author: Jan (janneke) Nieuwenhuizen <[email protected]> AuthorDate: Sun Dec 13 14:59:35 2020 +0100 commencement: tcc-boot0: Update to 0.9.26-1136-g0fbeb2dd. * gnu/packages/commencement.scm (tcc-boot0)[source]: Update to 0.9.26-1136-g0fbeb2dd. [native-inputs]: Add m2-planet-boot and mes-boot, remove %bootstrap-mescc-tools and %bootstrap-mes-rewired, and update nyacc to 1.00.2. --- gnu/packages/commencement.scm | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1c9abec..46a8dba 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -590,7 +590,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (define tcc-boot0 - ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 + ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 30 ;; patches. In a very early and rough form they were presented to the ;; TinyCC developers, who at the time showed no interest in supporting the ;; bootstrappable effort; we will try again later. These patches have been @@ -599,24 +599,26 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (package (inherit tcc) (name "tcc-boot0") - (version "0.9.26-1103-g6e62e0e") - (source (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/20191117/"; - "/tcc-" version ".tar.gz")) - (sha256 - (base32 - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng")))) + (version "0.9.26-1136-g5bba73cc") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://lilypond.org/janneke/tcc/"; + "/tcc-" version ".tar.gz")) + (sha256 + (base32 + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) - (snippet #f))) - ("mescc-tools" ,%bootstrap-mescc-tools) + ("mescc-tools" ,m2-planet-boot) + ("nyacc-source" ,(bootstrap-origin + (origin (inherit (package-source nyacc-1.00.2)) + (snippet #f)))) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f @@ -631,18 +633,17 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (with-directory-excursion ".." (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (dir (with-directory-excursion ".." (getcwd))) - (interpreter "/lib/mes-loader")) - - (setenv "prefix" out) - (setenv "GUILE_LOAD_PATH" - (string-append dir "/nyacc-0.99.0/module")) - + (interpreter "/lib/mes-loader") + (mes (assoc-ref inputs "mes")) + (mescc (string-append mes "/bin/mescc"))) (substitute* "conftest.c" (("volatile") "")) - + (setenv "prefix" out) + (setenv "GUILE_LOAD_PATH" + (string-append dir "/nyacc-1.00.2/module")) (invoke "sh" "configure" "--cc=mescc" (string-append "--prefix=" out) @@ -652,7 +653,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (replace 'build (lambda _ (substitute* "bootstrap.sh" ; Show some progress - (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) [^\"]*[^\\])\n" all space cmd) (string-append space "echo \"" cmd "\"\n" space cmd "\n"))) (invoke "sh" "bootstrap.sh")))
