Skip to content
Permalink
Browse files

git: update to 2.25.0

t3900 is passed on both musl and glibc now.
  • Loading branch information
sgn authored and xtraeme committed Dec 27, 2019
1 parent 8bf2b6d commit 9af1d1ed9b765089b5c588bab9d8d306e48ac606
Showing with 13 additions and 7 deletions.
  1. +8 −0 srcpkgs/git/patches/git-p4-python-3.patch
  2. +5 −7 srcpkgs/git/template
@@ -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.
#
@@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.24.1
revision=2
version=2.25.0
revision=1
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
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/"
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"
checksum=723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562
checksum=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
replaces="git-perl>=0"
register_shell=/usr/bin/git-shell

subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"

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

post_configure() {
@@ -32,9 +33,6 @@ post_configure() {
INSTALLDIRS=vendor
perllibdir=/usr/share/perl5/vendor_perl
EOF
case "$XBPS_TARGET_MACHINE" in
*-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;;
esac
}

post_build() {

0 comments on commit 9af1d1e

Please sign in to comment.
You can’t perform that action at this time.