git: Update to 2.13.1 (this time for real)

[termux-packages] / packages / git / build.sh

diff --git a/packages/git/build.sh b/packages/git/build.sh
index db94a43..f902f65 100755 (executable)
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less"
-TERMUX_PKG_VERSION=2.12.0
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027
+TERMUX_PKG_VERSION=2.13.1.2
+_REAL_VERSION=2.13.1
+TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${_REAL_VERSION}.tar.xz
+TERMUX_PKG_SHA256=3bc1becd983f77ab154a46801624369dbc40c3dd04b4c4b07ad026f5684688fe
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_fread_reads_directories=yes
@@ -40,6 +41,13 @@ termux_step_pre_configure () {
        # remains without bumped modification times, so are not picked
        # up by the package):
        rm -Rf $TERMUX_PREFIX/share/git-perl
+
+       # Fixes build if utfcpp is installed:
+       CPPFLAGS="-I$TERMUX_PKG_SRCDIR $CPPFLAGS"
+
+       # XXX: Should no longer be necessary after git v2.13.2:
+       # https://public-inbox.org/git/20170605203409.GB25777@dinwoodie.org/T/
+       CPPFLAGS+=" -DSHA1DC_FORCE_LITTLEENDIAN"
 }
 
 termux_step_post_make_install () {
@@ -63,7 +71,6 @@ termux_step_post_make_install () {
 
 termux_step_post_massage () {
        if [ ! -f libexec/git-core/git-remote-https ]; then
-               echo "ERROR: Built without https support"
-               exit 1
+               termux_error_exit "Git built without https support"
        fi
 }