bootstrap guile version mismatch on core-updates

[dftxbs3e <dftxbs3e@free.fr>]

[-- Attachment #1.1.1: Type: text/plain, Size: 613 bytes --]

Hello,

It seems that guile2.2 is built by make-bootstrap.scm here:
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/make-bootstrap.scm?h=core-updates#n625

but guile2.0 is expected here:
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/bootstrap.scm?h=core-updates#n373

For the purpose of my ongoing port to powerpc64le-linux-gnu, I applied
the attached patch, but obviously that one wont work with the previously
built tarballs for x86_64 etc. Things would have to be split in parts
somehow, for old bootstraps with version 2.0 and newer ones with version
2.2.

Thanks


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: bootstrap-guile-2.2.patch --]
[-- Type: text/x-patch; name="bootstrap-guile-2.2.patch", Size: 1056 bytes --]

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index d275c2867..c0b474a69 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@ -384,8 +384,8 @@ or false to signal an error."
                     (lambda (p)
                       (format p "\
 #!~a
-export GUILE_SYSTEM_PATH=~a/share/guile/2.0
-export GUILE_SYSTEM_COMPILED_PATH=~a/lib/guile/2.0/ccache
+export GUILE_SYSTEM_PATH=~a/share/guile/2.2
+export GUILE_SYSTEM_COMPILED_PATH=~a/lib/guile/2.2/ccache
 exec -a \"~a0\" ~a \"~a@\"\n"
                               bash out out dollar guile-real dollar)))
                   (chmod guile   #o555)
@@ -400,8 +400,8 @@ cd $out
 ~a -dc < $GUILE_TARBALL | ~a xv
 
 # Use the bootstrap guile to create its own wrapper to set the load path.
-GUILE_SYSTEM_PATH=$out/share/guile/2.0 \
-GUILE_SYSTEM_COMPILED_PATH=$out/lib/guile/2.0/ccache \
+GUILE_SYSTEM_PATH=$out/share/guile/2.2 \
+GUILE_SYSTEM_COMPILED_PATH=$out/lib/guile/2.2/ccache \
 $out/bin/guile -c ~s $out ~a
 
 # Sanity check.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]