self/fruix-bootstrap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix guile-newt wrapper runtime resolution

Browse Source
This commit is contained in:
Steffen Beyer
2026-04-08 13:00:06 +02:00
parent a4cebced06
commit 59b2e4f765
1 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/fruix
+71 -10
View File
@@ -43,6 +43,18 @@ shepherd_prefix=${SHEPHERD_PREFIX:-$default_shepherd_prefix}
script=$fruix_channel_dir/scripts/fruix.scm
modules_dir=$fruix_channel_dir/modules
discover_guile_newt_store()
{
if [ -n "${FRUIX_GUILE_NEWT_STORE:-}" ] && [ -d "$FRUIX_GUILE_NEWT_STORE" ]; then
printf '%s\n' "$FRUIX_GUILE_NEWT_STORE"
return 0
fi
for path in /frx/store/*-fruix-guile-newt-*; do
[ -d "$path" ] || continue
printf '%s\n' "$path"
done | sort | tail -n 1
}
if [ ! -d "$fruix_channel_dir" ]; then
echo "Fruix channel checkout not found: $fruix_channel_dir" >&2
echo "Set FRUIX_CHANNEL_DIR or clone $fruix_channel_url" >&2
@@ -62,13 +74,16 @@ if [ ! -x "$guile_bin" ]; then
fi
guile_prefix=$(CDPATH= cd -- "$(dirname "$guile_bin")/.." && pwd)
guile_lib_dir=$guile_prefix/lib
guile_version=$(LD_LIBRARY_PATH="$guile_lib_dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" "$guile_bin" -c '(display (effective-version))')
guile_newt_store=$(discover_guile_newt_store || true)
ensure_built() {
if [ ! -d "$guile_extra_prefix/share/guile/site" ] || \
! GUILE_LOAD_PATH="$guile_extra_prefix/share/guile/site/3.0${GUILE_LOAD_PATH:+:$GUILE_LOAD_PATH}" \
GUILE_LOAD_COMPILED_PATH="$guile_extra_prefix/lib/guile/3.0/site-ccache${GUILE_LOAD_COMPILED_PATH:+:$GUILE_LOAD_COMPILED_PATH}" \
GUILE_EXTENSIONS_PATH="$guile_extra_prefix/lib/guile/3.0/extensions${GUILE_EXTENSIONS_PATH:+:$GUILE_EXTENSIONS_PATH}" \
LD_LIBRARY_PATH="$guile_extra_prefix/lib:$guile_prefix/lib:/usr/local/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
! GUILE_LOAD_PATH="$guile_extra_prefix/share/guile/site/$guile_version${GUILE_LOAD_PATH:+:$GUILE_LOAD_PATH}" \
GUILE_LOAD_COMPILED_PATH="$guile_extra_prefix/lib/guile/$guile_version/site-ccache${GUILE_LOAD_COMPILED_PATH:+:$GUILE_LOAD_COMPILED_PATH}" \
GUILE_EXTENSIONS_PATH="$guile_extra_prefix/lib/guile/$guile_version/extensions${GUILE_EXTENSIONS_PATH:+:$GUILE_EXTENSIONS_PATH}" \
LD_LIBRARY_PATH="$guile_extra_prefix/lib:$guile_lib_dir:/usr/local/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
"$guile_bin" -c '(catch #t (lambda () (use-modules (fibers)) (display "ok") (newline)) (lambda _ (display "missing") (newline)))' | grep -qx ok; then
METADATA_OUT= ENV_OUT= GUILE_BIN="$guile_bin" INSTALL_PREFIX="$guile_extra_prefix" "$bootstrap_root/tests/shepherd/build-local-guile-fibers.sh"
fi
@@ -80,22 +95,68 @@ ensure_built() {
ensure_built
guile_lib_dir=$guile_prefix/lib
guile_load_path="$modules_dir:$guix_source_dir"
if [ -d "$shepherd_prefix/share/guile/site/$guile_version" ]; then
guile_load_path="$guile_load_path:$shepherd_prefix/share/guile/site/$guile_version"
fi
if [ -d "$guile_extra_prefix/share/guile/site/$guile_version" ]; then
guile_load_path="$guile_load_path:$guile_extra_prefix/share/guile/site/$guile_version"
fi
if [ -n "$guile_newt_store" ] && [ -d "$guile_newt_store/share/guile/site/$guile_version" ]; then
guile_load_path="$guile_load_path:$guile_newt_store/share/guile/site/$guile_version"
fi
if [ -n "${GUILE_LOAD_PATH:-}" ]; then
guile_load_path="$modules_dir:$guix_source_dir:$GUILE_LOAD_PATH"
else
guile_load_path="$modules_dir:$guix_source_dir"
guile_load_path="$guile_load_path:$GUILE_LOAD_PATH"
fi
guile_load_compiled_path=
if [ -d "$shepherd_prefix/lib/guile/$guile_version/site-ccache" ]; then
guile_load_compiled_path="$shepherd_prefix/lib/guile/$guile_version/site-ccache"
fi
if [ -d "$guile_extra_prefix/lib/guile/$guile_version/site-ccache" ]; then
guile_load_compiled_path="${guile_load_compiled_path:+$guile_load_compiled_path:}$guile_extra_prefix/lib/guile/$guile_version/site-ccache"
fi
if [ -n "${GUILE_LOAD_COMPILED_PATH:-}" ]; then
guile_load_compiled_path="${guile_load_compiled_path:+$guile_load_compiled_path:}$GUILE_LOAD_COMPILED_PATH"
fi
guile_extensions_path=
if [ -d "$guile_extra_prefix/lib/guile/$guile_version/extensions" ]; then
guile_extensions_path="$guile_extra_prefix/lib/guile/$guile_version/extensions"
fi
if [ -n "$guile_newt_store" ] && [ -d "$guile_newt_store/lib/guile/$guile_version/extensions" ]; then
guile_extensions_path="${guile_extensions_path:+$guile_extensions_path:}$guile_newt_store/lib/guile/$guile_version/extensions"
fi
if [ -n "${GUILE_EXTENSIONS_PATH:-}" ]; then
guile_extensions_path="${guile_extensions_path:+$guile_extensions_path:}$GUILE_EXTENSIONS_PATH"
fi
ld_library_path="$guile_extra_prefix/lib:$guile_lib_dir:/usr/local/lib"
ltdl_library_path="$ld_library_path"
if [ -n "$guile_newt_store" ] && [ -d "$guile_newt_store/lib" ]; then
ld_library_path="$guile_newt_store/lib:$ld_library_path"
ltdl_library_path="$guile_newt_store/lib:$ltdl_library_path"
fi
if [ -n "${LD_LIBRARY_PATH:-}" ]; then
ld_library_path="$ld_library_path:$LD_LIBRARY_PATH"
fi
if [ -n "${LTDL_LIBRARY_PATH:-}" ]; then
ltdl_library_path="$ltdl_library_path:$LTDL_LIBRARY_PATH"
fi
exec env \
GUILE_AUTO_COMPILE=0 \
GUILE_LOAD_PATH="$guile_load_path" \
LD_LIBRARY_PATH="$guile_lib_dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
GUILE_LOAD_COMPILED_PATH="$guile_load_compiled_path" \
GUILE_EXTENSIONS_PATH="$guile_extensions_path" \
LD_LIBRARY_PATH="$ld_library_path" \
LTDL_LIBRARY_PATH="$ltdl_library_path" \
GUILE_PREFIX="$guile_prefix" \
GUILE_EXTRA_PREFIX="$guile_extra_prefix" \
GUILE_NEWT_PREFIX="$guile_newt_store" \
SHEPHERD_PREFIX="$shepherd_prefix" \
GUIX_SOURCE_DIR="$guix_source_dir" \
FRUIX_GUILE_NEWT_STORE="$guile_newt_store" \
FRUIX_PROJECT_ROOT="$fruix_channel_dir" \
FRUIX_BOOTSTRAP_ROOT="$bootstrap_root" \
FRUIX_CHANNEL_DIR="$fruix_channel_dir" \