sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: Update from 2.17.1 to 2.18.0

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-06-23 23:52:54 +02:00
parent 1e4bea57d9
commit b3baca4292
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/git/build.sh
View File

@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
# less is required as a pager for git log, and the busybox less does not handle used escape sequences.
TERMUX_PKG_DEPENDS="libcurl, less, openssl, pcre2"
TERMUX_PKG_VERSION=2.17.1
TERMUX_PKG_SHA256=79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e
TERMUX_PKG_VERSION=2.18.0
TERMUX_PKG_SHA256=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -16,7 +16,14 @@ ac_cv_snprintf_returns_bogus=no
"
# 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 USE_LIBPCRE2=1"
TERMUX_PKG_EXTRA_MAKE_ARGS="
NO_NSEC=1
NO_GETTEXT=1
NO_EXPAT=1
NO_INSTALL_HARDLINKS=1
PERL_PATH=$TERMUX_PREFIX/bin/perl
USE_LIBPCRE2=1
"
TERMUX_PKG_BUILD_IN_SRC="yes"
# Things to remove to save space:

18
packages/git/run-command.c.patch
View File

@ -1,25 +1,25 @@
diff -u -r ../git-2.13.2/run-command.c ./run-command.c
--- ../git-2.13.2/run-command.c 2017-06-25 00:50:12.000000000 +0200
+++ ./run-command.c 2017-06-25 20:16:53.815627960 +0200
@@ -491,8 +491,10 @@
diff -u -r ../git-2.18.0/run-command.c ./run-command.c
--- ../git-2.18.0/run-command.c 2018-06-21 17:18:50.000000000 +0000
+++ ./run-command.c 2018-06-23 21:33:38.289465325 +0000
@@ -490,8 +490,10 @@
#else
bug_die(pthread_sigmask(SIG_SETMASK, &all, &as->old),
CHECK_BUG(pthread_sigmask(SIG_SETMASK, &all, &as->old),
"blocking all signals");
+# ifndef __ANDROID__
bug_die(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
CHECK_BUG(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
"disabling cancellation");
+# endif
#endif
}
@@ -502,8 +504,10 @@
@@ -501,8 +503,10 @@
if (sigprocmask(SIG_SETMASK, &as->old, NULL))
die_errno("sigprocmask");
#else
+# ifndef __ANDROID__
bug_die(pthread_setcancelstate(as->cs, NULL),
CHECK_BUG(pthread_setcancelstate(as->cs, NULL),
"re-enabling cancellation");
+# endif
bug_die(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
CHECK_BUG(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
"restoring signal mask");
#endif