git: Update to 2.13.1 (this time for real)
authorFredrik Fornwall <fredrik@fornwall.net>
Tue, 6 Jun 2017 21:37:06 +0000 (23:37 +0200)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 6 Jun 2017 21:37:06 +0000 (23:37 +0200)
We need to build with
-DSHA1DC_FORCE_LITTLEENDIAN
to avoid a portability problem with endian detection in git 2.13.1:
https://public-inbox.org/git/xmqqmv9l8h5z.fsf@gitster.mtv.corp.google.com/t/

We actually call this version 2.13.1.2 to force apt to consider it
a higher version - it's a temporary lie until 2.13.2 is available.

packages/git/build.sh

index 83271d2..f902f65 100755 (executable)
@@ -2,11 +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.13.1.1
-# Work around broken git build for 2.13.1:
-_REAL_VERSION=2.13.0
+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=4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258
+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
@@ -45,6 +44,10 @@ termux_step_pre_configure () {
 
        # 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 () {