diff --git a/steps-guix/guile-git-0.10.0/pass1.sh b/steps-guix/guile-git-0.10.0/pass1.sh index c60825ec..02590664 100755 --- a/steps-guix/guile-git-0.10.0/pass1.sh +++ b/steps-guix/guile-git-0.10.0/pass1.sh @@ -6,24 +6,24 @@ src_prepare() { } src_configure() { - local host_triplet pkg_config_path libgit2_cflags libgit2_static_libs + local host_triplet pkg_config_path libgit2_cflags libgit2_libs host_triplet="$(gcc -dumpmachine)" 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)" + libgit2_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ + /usr/bin/pkg-config --libs libgit2)" PATH="${PREFIX}/bin:/usr/bin:/bin" \ PKG_CONFIG="/usr/bin/pkg-config" \ PKG_CONFIG_LIBDIR="${pkg_config_path}" \ PKG_CONFIG_PATH="${pkg_config_path}" \ CPPFLAGS="${libgit2_cflags} ${CPPFLAGS:-}" \ - LIBS="${libgit2_static_libs}" \ + LIBS="${libgit2_libs}" \ LIBGIT2_CFLAGS="${libgit2_cflags}" \ - LIBGIT2_LIBS="${libgit2_static_libs}" \ + LIBGIT2_LIBS="${libgit2_libs}" \ libgit2_CFLAGS="${libgit2_cflags}" \ - libgit2_LIBS="${libgit2_static_libs}" \ + libgit2_LIBS="${libgit2_libs}" \ LD_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib:${LD_LIBRARY_PATH}" \ ./configure \ --prefix="${PREFIX}" \ @@ -35,20 +35,20 @@ src_configure() { } src_compile() { - local pkg_config_path libgit2_cflags libgit2_static_libs + local pkg_config_path libgit2_cflags libgit2_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)" + libgit2_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ + /usr/bin/pkg-config --libs libgit2)" CPPFLAGS="${libgit2_cflags} ${CPPFLAGS:-}" \ - LIBS="${libgit2_static_libs}" \ + LIBS="${libgit2_libs}" \ LIBGIT2_CFLAGS="${libgit2_cflags}" \ - LIBGIT2_LIBS="${libgit2_static_libs}" \ + LIBGIT2_LIBS="${libgit2_libs}" \ libgit2_CFLAGS="${libgit2_cflags}" \ - libgit2_LIBS="${libgit2_static_libs}" \ + libgit2_LIBS="${libgit2_libs}" \ default_src_compile } diff --git a/steps-guix/libgit2-1.9.2/pass1.sh b/steps-guix/libgit2-1.9.2/pass1.sh index 890f0f51..dc2c9c02 100644 --- a/steps-guix/libgit2-1.9.2/pass1.sh +++ b/steps-guix/libgit2-1.9.2/pass1.sh @@ -12,7 +12,7 @@ src_configure() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" \ - -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTS=OFF \ -DBUILD_CLI=OFF \ -DBUILD_EXAMPLES=OFF \