| Message ID | 20220502182434.32130-5-janneke@gnu.org |
|---|---|
| State | New |
| Headers | show |
| Series | The Full Source Bootstrap | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
"Jan (janneke) Nieuwenhuizen" <janneke@gnu.org> skribis: > * gnu/packages/commencement.scm (tcc-boot0)[source]: Update to > 0.9.26-1136-g0fbeb2dd. > [native-inputs]: Add stage0-posix and mes-boot, remove > %bootstrap-mescc-tools and %bootstrap-mes-rewired. [...] > (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 Slowly increasing. :-) > (source (bootstrap-origin > (origin > (method url-fetch) > (uri (string-append > - "https://lilypond.org/janneke/mes/20191117/" > + "https://lilypond.org/janneke/tcc/" > "/tcc-" version ".tar.gz")) > (sha256 > (base32 > - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) > + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) Eventually we should have that on ftp.gnu.org too, but I realize we might be better off addressing it afterwards since we’ll have to agree on the whole file tree we’re going to upload there. So… LGTM!
Ludovic Courtès writes: Hi, > "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org> skribis: > >> * gnu/packages/commencement.scm (tcc-boot0)[source]: Update to >> 0.9.26-1136-g0fbeb2dd. >> >> - ;; 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 > > Slowly increasing. :-) Yeah... >> (source (bootstrap-origin >> (origin >> (method url-fetch) >> (uri (string-append >> - "https://lilypond.org/janneke/mes/20191117/" >> + "https://lilypond.org/janneke/tcc/" >> "/tcc-" version ".tar.gz")) >> (sha256 >> (base32 >> - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) >> + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) > > Eventually we should have that on ftp.gnu.org too, but I realize we > might be better off addressing it afterwards since we’ll have to agree > on the whole file tree we’re going to upload there. Okay. I've kept the mirror:// put in place in the previous patch, it now looks like (uri (list (string-append "mirror://gnu/guix/mirror/" "tcc-" version ".tar.gz") (string-append "https://lilypond.org/janneke/tcc/" "tcc-" version ".tar.gz"))) Yeah, we may want to change them all to something like "mirror://gnu/guix/mirror/20220512/" ? The bootstrap-seeds may last a while, but stage0-posix and tcc will see more updates. After pushing all changes to wip-full-source-bootstrap I'm going to update test a new build, so we have some time to decide on this :-) Janneke
Hullo! Jan Nieuwenhuizen <janneke@gnu.org> skribis: > Okay. I've kept the mirror:// put in place in the previous patch, it > now looks like > > (uri (list > (string-append "mirror://gnu/guix/mirror/" > "tcc-" version ".tar.gz") > (string-append "https://lilypond.org/janneke/tcc/" > "tcc-" version ".tar.gz"))) > > Yeah, we may want to change them all to something like > > "mirror://gnu/guix/mirror/20220512/" > > ? The bootstrap-seeds may last a while, but stage0-posix and tcc will > see more updates. Source code tarballs (like tcc here) can go to: https://ftp.gnu.org/gnu/guix/mirror For “binary” seeds (which in fact are no longer “binary”!), we can follow the scheme at: https://ftp.gnu.org/gnu/guix/bootstrap/ … which looks like this: /gnu/guix/bootstrap/SYSTEM/DATE Or we could use /mirror as well, but then I’m not sure what that should look like. WDYT? See, the most difficult issues are yet to be solved. :-) Ludo’.
Ludovic Courtès writes: Hi, > Jan Nieuwenhuizen <janneke@gnu.org> skribis: > >> Okay. I've kept the mirror:// put in place in the previous patch, it >> now looks like >> >> (uri (list >> (string-append "mirror://gnu/guix/mirror/" >> "tcc-" version ".tar.gz") >> (string-append "https://lilypond.org/janneke/tcc/" >> "tcc-" version ".tar.gz"))) > > Source code tarballs (like tcc here) can go to: > > https://ftp.gnu.org/gnu/guix/mirror Okay, I have that for all tarballs right now. > For “binary” seeds (which in fact are no longer “binary”!), we can > follow the scheme at: > > https://ftp.gnu.org/gnu/guix/bootstrap/ > > … which looks like this: > > /gnu/guix/bootstrap/SYSTEM/DATE > > Or we could use /mirror as well, but then I’m not sure what that > should look like. WDYT? Yes, the only thing sort of "binary" is bootstrap-seeds-1.0.tar.gz, which is not "really" a binary package. The SYSTEM bit is not relevant and the date is neither. (I guess that this https://savannah.nongnu.org/task/?func=detailitem&item_id=15859#options could get a follow-up, some time.) > See, the most difficult issues are yet to be solved. :-) I see! Just when I thought the hardest bits were done :-) Meanwhile, building /gnu/store/7il52fh6m0pa9lvzqpxkzpq68pb4svcl-gcc-10.3.0.drv... so I guess we're okay. I'll be waiting for it to finish, though. Greetings, Janneke
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7f1ba7aa6a..8b8b243754 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -608,7 +608,7 @@ (define (objects-in-dir dir) (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 @@ -617,26 +617,26 @@ (define tcc-boot0 (package (inherit tcc) (name "tcc-boot0") - (version "0.9.26-1103-g6e62e0e") + (version "0.9.26-1136-g5bba73cc") (source (bootstrap-origin (origin (method url-fetch) (uri (string-append - "https://lilypond.org/janneke/mes/20191117/" + "https://lilypond.org/janneke/tcc/" "/tcc-" version ".tar.gz")) (sha256 (base32 - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) + ("mescc-tools" ,stage0-posix) ("nyacc-source" ,(bootstrap-origin (origin (inherit (package-source nyacc-1.00.2)) (snippet #f)))) - ("mescc-tools" ,%bootstrap-mescc-tools) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f @@ -651,18 +651,17 @@ (define tcc-boot0 (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) @@ -672,7 +671,7 @@ (define tcc-boot0 (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"))) @@ -892,8 +891,8 @@ (define tcc-boot (string-append out "/include")) (copy-recursively (string-append tcc "/lib") (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (invoke "./tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "./tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) (delete-file (string-append out "/lib/tcc/libtcc1.a")) (copy-file "libtcc1.a"