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

fix(guile-git): link against static libgit2 explicitly

Browse source
This commit is contained in:
vxtls 2026-03-05 15:53:55 -05:00
parent a3acfbe94d
commit 9055660d81
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
steps-guix/guile-git-0.10.0/pass1.sh
View file

@ -6,14 +6,25 @@ src_prepare() {
} }
src_configure() { src_configure() {
local host_triplet pkg_config_path local host_triplet pkg_config_path libgit2_cflags libgit2_static_libs
host_triplet="$(gcc -dumpmachine)" host_triplet="$(gcc -dumpmachine)"
pkg_config_path="${LIBDIR}/pkgconfig" pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig"
libgit2_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --cflags libgit2)"
libgit2_static_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --static --libs libgit2)"
PATH="${PREFIX}/bin:/usr/bin:/bin" \ PATH="${PREFIX}/bin:/usr/bin:/bin" \
PKG_CONFIG_LIBDIR="${pkg_config_path}:${PREFIX}/lib/pkgconfig" \ PKG_CONFIG="/usr/bin/pkg-config" \
PKG_CONFIG_PATH="${pkg_config_path}:${PREFIX}/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="${pkg_config_path}" \
LD_LIBRARY_PATH="${LIBDIR}:${LD_LIBRARY_PATH}" \ PKG_CONFIG_PATH="${pkg_config_path}" \
CPPFLAGS="${libgit2_cflags} ${CPPFLAGS:-}" \
LIBS="${libgit2_static_libs}" \
LIBGIT2_CFLAGS="${libgit2_cflags}" \
LIBGIT2_LIBS="${libgit2_static_libs}" \
libgit2_CFLAGS="${libgit2_cflags}" \
libgit2_LIBS="${libgit2_static_libs}" \
LD_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib:${LD_LIBRARY_PATH}" \
./configure \ ./configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--libdir="${LIBDIR}" \ --libdir="${LIBDIR}" \
@ -22,6 +33,20 @@ src_configure() {
} }
src_compile() { src_compile() {
local pkg_config_path libgit2_cflags libgit2_static_libs
pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig"
libgit2_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --cflags libgit2)"
libgit2_static_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \
/usr/bin/pkg-config --static --libs libgit2)"
CPPFLAGS="${libgit2_cflags} ${CPPFLAGS:-}" \
LIBS="${libgit2_static_libs}" \
LIBGIT2_CFLAGS="${libgit2_cflags}" \
LIBGIT2_LIBS="${libgit2_static_libs}" \
libgit2_CFLAGS="${libgit2_cflags}" \
libgit2_LIBS="${libgit2_static_libs}" \
default_src_compile default_src_compile
} }