kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-05-31 22:30:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix): accept local muslx32 bootstrap Guile host type

Browse source
This commit is contained in:
vxtls 2026-05-12 20:23:45 -04:00
parent ada618239b
commit 2a58e2c1d3
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
steps-guix/guix-1.5.0/patches/accept-local-bootstrap-guile-host-type.patch Normal file
View file

@ -0,0 +1,18 @@
--- guix-1.5.0/tests/guix-environment.sh
+++ guix-1.5.0/tests/guix-environment.sh
@@ -136,10 +136,13 @@
case "`uname -m`" in
x86_64)
# On x86_64, we should be able to create a 32-bit environment.
+ # This bootstrap uses the locally built muslx32 Guile seed for the
+ # i686-linux bootstrap input, so %host-type reports the seed's actual
+ # ABI instead of upstream Guix's historical i686 bootstrap triplet.
guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-- guile -c '(exit (string-prefix? "x86_64" %host-type))'
guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-s i686-linux \
- -- guile -c '(exit (string-prefix? "i686" %host-type))'
+ -- guile -c '(exit (string=? "x86_64-pc-linux-muslx32" %host-type))'
;;
*)
echo "nothing to do" >&2