01/03: tcc-boot0: Do not update...fixes gawk-mesboot0 (hmm...wip-arm-bootstrap)

[guix-commits]

janneke pushed a commit to branch wip-full-source-bootstrap
in repository guix.

commit 6045fcd318497ce71408455ac1992ed18c2cba38
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jan 3 11:08:42 2021 +0100

    tcc-boot0: Do not update...fixes gawk-mesboot0 (hmm...wip-arm-bootstrap)
---
 gnu/packages/commencement.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 41598aa..420951b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -482,7 +482,7 @@ M1, and M2-Planet.")
 
 
 (define tcc-boot0
-  ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 30
+  ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11
   ;; 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
@@ -491,16 +491,15 @@ M1, and M2-Planet.")
   (package
     (inherit tcc)
     (name "tcc-boot0")
-    (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")))))
+    (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"))))
     (build-system gnu-build-system)
     (supported-systems '("i686-linux" "x86_64-linux"))
     (inputs '())
@@ -528,9 +527,7 @@ M1, and M2-Planet.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref %outputs "out"))
                     (dir (with-directory-excursion ".." (getcwd)))
-                    (interpreter "/lib/mes-loader")
-                    (mes (assoc-ref inputs "mes"))
-                    (mescc (string-append mes "/bin/mescc")))
+                    (interpreter "/lib/mes-loader"))
                (substitute* "conftest.c"
                  (("volatile") ""))
                (setenv "prefix" out)
@@ -545,7 +542,7 @@ M1, and M2-Planet.")
          (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")))