diff options
Diffstat (limited to 'core/git')
| -rwxr-xr-x | core/git/build | 21 | ||||
| -rw-r--r-- | core/git/checksums | 4 | ||||
| -rw-r--r-- | core/git/sources | 4 | ||||
| -rw-r--r-- | core/git/version | 2 |
4 files changed, 9 insertions, 22 deletions
diff --git a/core/git/build b/core/git/build index b61896fa..66665b66 100755 --- a/core/git/build +++ b/core/git/build @@ -10,6 +10,8 @@ NO_PYTHON=YesPlease NO_SYS_POLL_H=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 +NO_CURL= +CURL_LDFLAGS=$(pkgconf --static --libs libcurl) EOF export LDFLAGS="$LDFLAGS -static" @@ -23,20 +25,5 @@ export LDFLAGS="$LDFLAGS -static" make make DESTDIR="$1" install -clman -d "$1" man1/*.1 man5/*.5 man7/*.7 - -# 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 d5b22268..4aa9ea0d 100644 --- a/core/git/checksums +++ b/core/git/checksums @@ -1,3 +1,3 @@ %BLAKE3 -b3496fc2c74ee9536ed1bc7e47fa95eb1b2cb19b9735d16b29e59e9e5fa1e05c git-2.38.1.tar.xz -b97b9038166903745cd66e06b088e21f7bf186c82de56da84026aeb94ef5926c git-manpages-2.38.1.tar.xz +124d009520c5248ea62d2922c88d746d85d37dee31827586e4979202ba3c4bc1 git-2.46.2.tar.xz +bd01a8f8b03c6a7ac14f3d9b3bbcb2622c24e8baab4a1992e056ca63c7d3d5f5 git-manpages-2.46.2.tar.xz diff --git a/core/git/sources b/core/git/sources index 17ea9cc2..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.38.1.tar.xz -https://www.kernel.org/pub/software/scm/git/git-manpages-2.38.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 becb8f74..d19477f7 100644 --- a/core/git/version +++ b/core/git/version @@ -1 +1 @@ -2.38.1 1 +2.46.2 1 |