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-gnutls): align guile-gnutls build flags and pin GNUTLS extension dir during guix configure

Browse source
This commit is contained in:
vxtls 2026-03-05 08:24:55 -05:00
parent 3f01d14c80
commit 451fdc63ca
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,33 +6,40 @@ src_prepare() {
}
src_configure() {
local host_triplet pkg_config_path
local host_triplet pkg_config_path guile_cflags guile_libs gnutls_libs
host_triplet="$(gcc -dumpmachine)"
pkg_config_path="${LIBDIR}/pkgconfig"
pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig"
guile_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --cflags guile-3.0)"
guile_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --libs guile-3.0)"
gnutls_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --libs gnutls)"
PATH="${PREFIX}/bin:/usr/bin:/bin" \
PKG_CONFIG="/usr/bin/pkg-config" \
PKG_CONFIG_LIBDIR="${pkg_config_path}" \
PKG_CONFIG_PATH="${pkg_config_path}" \
LD_LIBRARY_PATH="${LIBDIR}:${LD_LIBRARY_PATH}" \
LIBS="$(pkg-config --libs guile-3.0)" \
GUILE_LIBS="$(pkg-config --libs guile-3.0)" \
GNUTLS_LIBS="$(pkg-config --libs gnutls)" \
LD_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib:${LD_LIBRARY_PATH}" \
GUILE_CFLAGS="${guile_cflags}" \
GUILE_LIBS="${guile_libs}" \
GNUTLS_LIBS="${gnutls_libs}" \
./configure \
--prefix="${PREFIX}" \
--libdir="${LIBDIR}" \
--host="${host_triplet}" \
--build="${host_triplet}" \
--enable-static \
--enable-shared
--disable-static \
--enable-shared \
'--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
'--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
'--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions'
}
src_compile() {
make "${MAKEJOBS}" -f Makefile PREFIX="${PREFIX}" \
CROSS_COMPILING_VARIABLE="GNUTLS_GUILE_CROSS_COMPILING=yes"
default_src_compile
}
src_install() {
make -f Makefile install PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" \
CROSS_COMPILING_VARIABLE="GNUTLS_GUILE_CROSS_COMPILING=yes"
default_src_install
}

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

@ -100,6 +100,7 @@ src_configure() {
GUILE_SYSTEM_PATH="${guile_site_path}" \
GUILE_SYSTEM_COMPILED_PATH="${guile_site_ccache}:${guile_core_ccache}" \
GUILE_EXTENSIONS_PATH="${guile_ext_path}" \
GNUTLS_GUILE_EXTENSION_DIR="${guile_ext_path}" \
GUILE_CFLAGS="${guile_cflags}" \
GUILE_LIBS="${guile_libs}" \
./configure \