~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(un)zip: fix bip2 support (#2364)
[termux-packages]
/
packages
/
git
/
build.sh
diff --git
a/packages/git/build.sh
b/packages/git/build.sh
index
de96545
..
d09d208
100755
(executable)
--- a/
packages/git/build.sh
+++ b/
packages/git/build.sh
@@
-1,10
+1,11
@@
TERMUX_PKG_HOMEPAGE=https://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
"
+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.
# 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_DEPENDS="libcurl, less, openssl, pcre2"
+TERMUX_PKG_VERSION=2.17.0
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_fread_reads_directories=yes
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_fread_reads_directories=yes
@@
-16,7
+17,7
@@
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):
"
# 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"
+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:
TERMUX_PKG_BUILD_IN_SRC="yes"
# Things to remove to save space:
@@
-40,6
+41,9
@@
termux_step_pre_configure () {
# remains without bumped modification times, so are not picked
# up by the package):
rm -Rf $TERMUX_PREFIX/share/git-perl
# 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"
}
termux_step_post_make_install () {
}
termux_step_post_make_install () {