kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix-1.5.0): use static guile pkg-config libs and stable libs ordering for daemon linking

Browse source
This commit is contained in:
vxtls 2026-03-07 20:06:42 -05:00
parent 6d0db68132
commit bab05bbbe3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
steps-guix/guix-1.5.0/pass1.sh
View file

@ -175,8 +175,10 @@ src_configure() {
argp_ldflags="-L${KERNEL_SYSROOT}/lib" argp_ldflags="-L${KERNEL_SYSROOT}/lib"
guile_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ guile_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --cflags guile-3.0)" /usr/bin/pkg-config --cflags guile-3.0)"
# Guix daemon links Guile statically in this environment; use --static so
# private deps (e.g. libunistring for uc_* symbols) are included.
guile_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ guile_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --libs guile-3.0)" /usr/bin/pkg-config --static --libs guile-3.0)"
probe_guile_module gnutls probe_guile_module gnutls
probe_guile_module git probe_guile_module git
@ -199,7 +201,7 @@ src_configure() {
GUILE_LIBS="${guile_libs}" \ GUILE_LIBS="${guile_libs}" \
CPPFLAGS="${argp_cppflags} ${CPPFLAGS:-}" \ CPPFLAGS="${argp_cppflags} ${CPPFLAGS:-}" \
LDFLAGS="${argp_ldflags} ${LDFLAGS:-}" \ LDFLAGS="${argp_ldflags} ${LDFLAGS:-}" \
LIBS="-largp ${LIBS:-}" \ LIBS="${LIBS:-} -largp" \
./configure \ ./configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--libdir="${LIBDIR}" \ --libdir="${LIBDIR}" \