git: update to 2.25.0

t3900 is passed on both musl and glibc now.
This commit is contained in:
Đoàn Trần Công Danh 2019-12-27 19:59:04 +07:00 committed by Juan RP
parent 8bf2b6dc99
commit 9af1d1ed9b
2 changed files with 13 additions and 7 deletions

View File

@ -0,0 +1,8 @@
--- git-p4.py
+++ git-p4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
#

View File

@ -1,7 +1,7 @@
# Template file for 'git' # Template file for 'git'
pkgname=git pkgname=git
version=2.24.1 version=2.25.0
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no ac_cv_fread_reads_directories=yes" ac_cv_snprintf_returns_bogus=no ac_cv_fread_reads_directories=yes"
@ -16,14 +16,15 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/" homepage="https://git-scm.com/"
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562 checksum=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
replaces="git-perl>=0" replaces="git-perl>=0"
register_shell=/usr/bin/git-shell register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc" subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) export GIT_SKIP_TESTS='t3900' ;; *-musl) configure_args+=" ac_cv_iconv_omits_bom=yes" ;;
*) configure_args+=" ac_cv_iconv_omits_bom=no" ;;
esac esac
post_configure() { post_configure() {
@ -32,9 +33,6 @@ post_configure() {
INSTALLDIRS=vendor INSTALLDIRS=vendor
perllibdir=/usr/share/perl5/vendor_perl perllibdir=/usr/share/perl5/vendor_perl
EOF EOF
case "$XBPS_TARGET_MACHINE" in
*-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;;
esac
} }
post_build() { post_build() {