diff options
Diffstat (limited to 'core/git')
| -rwxr-xr-x | core/git/build | 28 | ||||
| -rw-r--r-- | core/git/checksums | 5 | ||||
| -rw-r--r-- | core/git/depends | 2 | ||||
| -rw-r--r-- | core/git/meta | 3 | ||||
| -rw-r--r-- | core/git/sources | 4 | ||||
| -rw-r--r-- | core/git/version | 2 |
6 files changed, 14 insertions, 30 deletions
diff --git a/core/git/build b/core/git/build index a0228ee5..66665b66 100755 --- a/core/git/build +++ b/core/git/build @@ -1,7 +1,5 @@ #!/bin/sh -e -sed -i '/^\#include.*openssl.*\.h/d' git-compat-util.h - cat > config.mak <<EOF NO_GETTEXT=YesPlease NO_SVN_TESTS=YesPlease @@ -9,11 +7,11 @@ NO_TCLTK=YesPlease NO_EXPAT=YesPlease NO_NSEC=YesPlease NO_PYTHON=YesPlease -NO_PERL=YesPlease NO_SYS_POLL_H=1 -NO_OPENSSL=YesPlease NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 +NO_CURL= +CURL_LDFLAGS=$(pkgconf --static --libs libcurl) EOF export LDFLAGS="$LDFLAGS -static" @@ -27,23 +25,5 @@ export LDFLAGS="$LDFLAGS -static" make make DESTDIR="$1" install -for man in man1/*.1 man5/*.5 man7/*.7; do - install -Dm644 "$man" "$1/usr/share/man/$man" -done - - -# Build and install remote-http helper. This doesn't happen by default when -# building static git. -set -x -export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -I$PWD -I$PWD/compat/regex -I$PWD/xdiff -include config.h" -for obj in http http-walker; do - # shellcheck disable=2086 - "${CC:=cc}" $CFLAGS -c "$obj.c" -done - -# shellcheck disable=2086,2046 -"$CC" $LDFLAGS $CFLAGS -o "$1/usr/libexec/git-core/git-remote-http" remote-curl.c http.o http-walker.o libgit.a common-main.o xdiff/lib.a $(pkg-config --static --libs zlib libcurl) - -for remote in https ftp ftps; do - ln -sf git-remote-http "$1/usr/libexec/git-core/git-remote-$remote" -done +# Install manual pages +clman -d "$1" man[0-9]/*.[0-9] diff --git a/core/git/checksums b/core/git/checksums index edd04151..4aa9ea0d 100644 --- a/core/git/checksums +++ b/core/git/checksums @@ -1,2 +1,3 @@ -f988a8a095089978dab2932af4edb22b4d7d67d67b81aaa1986fa29ef45d9467 git-2.30.1.tar.xz -30fc7ecbd964bb19a2ca1a695fe7af430740e09bd1c134cd3730783abec5b904 git-manpages-2.30.1.tar.xz +%BLAKE3 +124d009520c5248ea62d2922c88d746d85d37dee31827586e4979202ba3c4bc1 git-2.46.2.tar.xz +bd01a8f8b03c6a7ac14f3d9b3bbcb2622c24e8baab4a1992e056ca63c7d3d5f5 git-manpages-2.46.2.tar.xz diff --git a/core/git/depends b/core/git/depends index 0a37ab16..7a3c084e 100644 --- a/core/git/depends +++ b/core/git/depends @@ -1,4 +1,4 @@ -bearssl make curl make +libressl make pkgconf make zlib make diff --git a/core/git/meta b/core/git/meta new file mode 100644 index 00000000..db6a5c11 --- /dev/null +++ b/core/git/meta @@ -0,0 +1,3 @@ +description: Distributed Version Control System +license: GPL-2.0-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/git/sources b/core/git/sources index a87f20e9..3cf5e342 100644 --- a/core/git/sources +++ b/core/git/sources @@ -1,2 +1,2 @@ -https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.30.1.tar.xz -https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.1.tar.xz +https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.46.2.tar.xz +https://www.kernel.org/pub/software/scm/git/git-manpages-2.46.2.tar.xz diff --git a/core/git/version b/core/git/version index ed09e751..d19477f7 100644 --- a/core/git/version +++ b/core/git/version @@ -1 +1 @@ -2.30.1 1 +2.46.2 1 |