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 0d33e68..f902f65 100755 (executable)
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -1,11 +1,20 @@
-TERMUX_PKG_HOMEPAGE=http://git-scm.com/
+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.9.3
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
+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="--without-tcltk --with-curl --with-shell=$TERMUX_PREFIX/bin/sh ac_cv_header_libintl_h=no ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_fread_reads_directories=yes
+ac_cv_header_libintl_h=no
+ac_cv_snprintf_returns_bogus=no
+--with-curl
+--without-tcltk
+--with-shell=$TERMUX_PREFIX/bin/sh
+"
 # expat is only used by git-http-push for remote lock management over DAV, so disable:
 # NO_INSTALL_HARDLINKS to use symlinks instead of hardlinks (which does not work on Android M):
 TERMUX_PKG_EXTRA_MAKE_ARGS="NO_NSEC=1 NO_GETTEXT=1 NO_EXPAT=1 NO_INSTALL_HARDLINKS=1 PERL_PATH=$TERMUX_PREFIX/bin/perl"
@@ -14,7 +23,14 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 # Things to remove to save space:
 #  bin/git-cvsserver - server emulating CVS
 #  bin/git-shell - restricted login shell for Git-only SSH access
-TERMUX_PKG_RM_AFTER_INSTALL="bin/git-cvsserver bin/git-shell Library"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/git-cvsserver
+bin/git-shell
+libexec/git-core/git-shell
+libexec/git-core/git-cvsserver
+share/man/man1/git-cvsserver.1
+share/man/man1/git-shell.1
+"
 
 termux_step_pre_configure () {
        # Setup perl so that the build process can execute it:
@@ -25,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 () {
@@ -40,11 +63,14 @@ termux_step_post_make_install () {
 
        # Remove clutter:
        rm -Rf $TERMUX_PREFIX/lib/*-linux*/perl
+
+       # Remove duplicated binaries in bin/ with symlink to the one in libexec/git-core:
+       (cd $TERMUX_PREFIX/bin; ln -s -f ../libexec/git-core/git git)
+       (cd $TERMUX_PREFIX/bin; ln -s -f ../libexec/git-core/git-upload-pack git-upload-pack)
 }
 
 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
 }