diff --git a/steps-guix/git-2.53.0/pass1.sh b/steps-guix/git-2.53.0/pass1.sh new file mode 100644 index 00000000..c7e927a4 --- /dev/null +++ b/steps-guix/git-2.53.0/pass1.sh @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default +} + +src_configure() { + local host_triplet curl_static_libs + host_triplet="$(gcc -dumpmachine)" + curl_static_libs="-lcurl -lssl -lcrypto -lz -pthread" + + PATH="${PREFIX}/bin:/usr/bin:/bin" \ + LIBS="${curl_static_libs}" \ + ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --build="${host_triplet}" \ + --host="${host_triplet}" +} + +src_compile() { + local curl_static_libs + curl_static_libs="-lcurl -lssl -lcrypto -lz -pthread" + + make "${MAKEJOBS}" \ + NO_GETTEXT=YesPlease \ + NO_TCLTK=YesPlease \ + NO_PERL=YesPlease \ + NO_PYTHON=YesPlease \ + CURL_LDFLAGS="${curl_static_libs}" +} + +src_install() { + local curl_static_libs + curl_static_libs="-lcurl -lssl -lcrypto -lz -pthread" + + make install \ + NO_GETTEXT=YesPlease \ + NO_TCLTK=YesPlease \ + NO_PERL=YesPlease \ + NO_PYTHON=YesPlease \ + CURL_LDFLAGS="${curl_static_libs}" \ + DESTDIR="${DESTDIR}" \ + prefix="${PREFIX}" \ + libdir="${LIBDIR}" +} diff --git a/steps-guix/git-2.53.0/patches/static-libcurl-link.patch b/steps-guix/git-2.53.0/patches/static-libcurl-link.patch new file mode 100644 index 00000000..bad42a7b --- /dev/null +++ b/steps-guix/git-2.53.0/patches/static-libcurl-link.patch @@ -0,0 +1,19 @@ +--- git-2.53.0/configure ++++ git-2.53.0/configure +@@ -5582,7 +5582,7 @@ + printf %s "(cached) " >&6 + else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcurl $LIBS" ++LIBS="-lcurl -lssl -lcrypto -lz -pthread $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5695,6 +5695,7 @@ + fi + + CURL_LDFLAGS=$($CURL_CONFIG $CURL_CONFIG_OPTS) ++ CURL_LDFLAGS="$CURL_LDFLAGS -lssl -lcrypto -lz -pthread" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Setting CURL_LDFLAGS to '$CURL_LDFLAGS'" >&5 + printf "%s\n" "$as_me: Setting CURL_LDFLAGS to '$CURL_LDFLAGS'" >&6;} + diff --git a/steps-guix/git-2.53.0/sources b/steps-guix/git-2.53.0/sources new file mode 100644 index 00000000..3eed27d2 --- /dev/null +++ b/steps-guix/git-2.53.0/sources @@ -0,0 +1 @@ +f https://www.kernel.org/pub/software/scm/git/git-2.53.0.tar.xz 5818bd7d80b061bbbdfec8a433d609dc8818a05991f731ffc4a561e2ca18c653 diff --git a/steps-guix/manifest b/steps-guix/manifest index 860772e9..920e1fe4 100644 --- a/steps-guix/manifest +++ b/steps-guix/manifest @@ -16,4 +16,11 @@ improve: get_network build: libgpg-error-1.59 build: libgcrypt-1.12.1 build: guile-gcrypt-0.5.0 +build: git-2.53.0 +# build: cmake +# build: libgit +# build: nettle-3.10.2 +# build: libtasn1-v4.21.0 +# build: p11-kit-0.26.2 +# build: improve: after