~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vim: Update from 8.0.0704 to 8.0.0738
[termux-packages]
/
packages
/
git
/
build.sh
diff --git
a/packages/git/build.sh
b/packages/git/build.sh
index
6a6ced3
..
6eb14a1
100755
(executable)
--- a/
packages/git/build.sh
+++ b/
packages/git/build.sh
@@
-1,11
+1,19
@@
-TERMUX_PKG_HOMEPAGE=http://git-scm.com/
+TERMUX_PKG_HOMEPAGE=http
s
://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_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.2
+TERMUX_PKG_VERSION=2.
13.3
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=91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
## 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"
# 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
+22,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
# 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:
termux_step_pre_configure () {
# Setup perl so that the build process can execute it:
@@
-25,6
+40,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 () {
@@
-40,11
+58,14
@@
termux_step_post_make_install () {
# Remove clutter:
rm -Rf $TERMUX_PREFIX/lib/*-linux*/perl
# 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
}
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
}
fi
}