X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ca802458650eb925a25b6fd6d1ba71255f466860..718a0392ef706917e7c0d029ff6d20cb96640819:/packages/git/build.sh?ds=sidebyside

diff --git a/packages/git/build.sh b/packages/git/build.sh
index ddf8d2f9..f902f650 100755
--- 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.2
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a
+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 () {