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

fix(guix-runtime): pin guile/gnutls runtime search paths and drop static link flags in guile-gnutls build

Browse source
This commit is contained in:
vxtls 2026-03-05 07:53:42 -05:00
parent bd208bf124
commit 3f01d14c80
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
steps-guix/guile-gnutls-v5.0.1/pass1.sh
View file

@ -11,12 +11,13 @@ src_configure() {
pkg_config_path="${LIBDIR}/pkgconfig" pkg_config_path="${LIBDIR}/pkgconfig"
PATH="${PREFIX}/bin:/usr/bin:/bin" \ PATH="${PREFIX}/bin:/usr/bin:/bin" \
PKG_CONFIG="/usr/bin/pkg-config" \
PKG_CONFIG_LIBDIR="${pkg_config_path}" \ PKG_CONFIG_LIBDIR="${pkg_config_path}" \
PKG_CONFIG_PATH="${pkg_config_path}" \ PKG_CONFIG_PATH="${pkg_config_path}" \
LD_LIBRARY_PATH="${LIBDIR}:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${LIBDIR}:${LD_LIBRARY_PATH}" \
LIBS="$(pkg-config --static --libs guile-3.0)" \ LIBS="$(pkg-config --libs guile-3.0)" \
GUILE_LIBS="$(pkg-config --static --libs guile-3.0)" \ GUILE_LIBS="$(pkg-config --libs guile-3.0)" \
GNUTLS_LIBS="$(pkg-config --static --libs gnutls)" \ GNUTLS_LIBS="$(pkg-config --libs gnutls)" \
./configure \ ./configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--libdir="${LIBDIR}" \ --libdir="${LIBDIR}" \

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

@ -78,16 +78,28 @@ src_prepare() {
src_configure() { src_configure() {
local host_triplet pkg_config_path guile_cflags guile_libs local host_triplet pkg_config_path guile_cflags guile_libs
local guile_site_path guile_site_ccache guile_core_ccache guile_ext_path
host_triplet="$(gcc -dumpmachine)" host_triplet="$(gcc -dumpmachine)"
pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig" pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig"
guile_site_path="${PREFIX}/share/guile/site/3.0:${PREFIX}/share/guile/3.0"
guile_site_ccache="${LIBDIR}/guile/3.0/site-ccache"
guile_core_ccache="${LIBDIR}/guile/3.0/ccache"
guile_ext_path="${LIBDIR}/guile/3.0/extensions"
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)"
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 --libs guile-3.0)"
PATH="${PREFIX}/bin:/usr/bin:/bin" \
PKG_CONFIG="/usr/bin/pkg-config" \ PKG_CONFIG="/usr/bin/pkg-config" \
PKG_CONFIG_LIBDIR="${pkg_config_path}" \ PKG_CONFIG_LIBDIR="${pkg_config_path}" \
PKG_CONFIG_PATH="${pkg_config_path}" \ PKG_CONFIG_PATH="${pkg_config_path}" \
LD_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib:${LD_LIBRARY_PATH}" \
GUILE_LOAD_PATH="${guile_site_path}" \
GUILE_LOAD_COMPILED_PATH="${guile_site_ccache}:${guile_core_ccache}" \
GUILE_SYSTEM_PATH="${guile_site_path}" \
GUILE_SYSTEM_COMPILED_PATH="${guile_site_ccache}:${guile_core_ccache}" \
GUILE_EXTENSIONS_PATH="${guile_ext_path}" \
GUILE_CFLAGS="${guile_cflags}" \ GUILE_CFLAGS="${guile_cflags}" \
GUILE_LIBS="${guile_libs}" \ GUILE_LIBS="${guile_libs}" \
./configure \ ./configure \