fix(guix-bootstrap): split bootstrap exec xz from static-binaries, use xz 5.0.6, just give it a try to solve problem

This commit is contained in:
vxtls 2026-04-04 21:42:58 -04:00
parent 3007c9a8dd
commit 39796fd955
5 changed files with 47 additions and 1 deletions

View file

@ -0,0 +1,15 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-3.0-or-later
set -e
dist="${DISTFILES:-/external/distfiles}"
xz_src="/bootstrap-seeds/xz-5.0.6/bin/xz"
xz_dst="${dist}/bootstrap-exec-xz-i686-linux"
if [ ! -x "${xz_src}" ]; then
echo "Missing required bootstrap seed executable: ${xz_src}" >&2
exit 1
fi
install -D -m 0755 "${xz_src}" "${xz_dst}"

View file

@ -59,6 +59,9 @@ build: bzip2-1.0.6
build: patch-2.7.6
build: bash-5.3-1
build: static-binaries-0-i686-linux
# Build legacy xz seed, then export bootstrap-exec-xz-i686-linux
build: xz-5.0.6
improve: bootstrap-exec-xz-i686-linux
# Build guile-static-stripped-2.0.9-i686-linux.tar.xz
build: libunistring-1.4.1-guix
build: gc-8.2.12-guix

View file

@ -36,7 +36,6 @@ src_compile() {
seed_install_exec "${stage}/bin/bash" "${dist}/bootstrap-exec-bash-i686-linux"
seed_install_exec "${stage}/bin/mkdir" "${dist}/bootstrap-exec-mkdir-i686-linux"
seed_install_exec "${stage}/bin/tar" "${dist}/bootstrap-exec-tar-i686-linux"
seed_install_exec "${stage}/bin/xz" "${dist}/bootstrap-exec-xz-i686-linux"
}
src_install() {

View file

@ -0,0 +1,28 @@
# SPDX-License-Identifier: GPL-3.0-or-later
SEED_PREFIX="/bootstrap-seeds/xz-5.0.6"
src_prepare() {
default
# Mirror Guix bootstrap static strategy: force libtool-built xz executable
# to link with -all-static.
sed -i 's/^xz_LDADD =/xz_LDADD = -all-static /' src/xz/Makefile.in
}
src_configure() {
CFLAGS="${CFLAGS:-} -std=gnu89" \
./configure \
--prefix="${SEED_PREFIX}" \
--disable-shared \
--enable-static \
--disable-nls
}
src_compile() {
default_src_compile
}
src_install() {
make DESTDIR="${DESTDIR}" install
}

View file

@ -0,0 +1 @@
f https://tukaani.org/xz/xz-5.0.6.tar.gz b6cf4cdc1313556a00848e722625bce40d2cd552c052b0465791c64c9202c3f1