git: update to 2.36.0

This commit is contained in:
tjhexf 2022-05-03 20:32:59 -03:00 committed by xtkoba
parent c1e7d87fd3
commit b2fc349175
2 changed files with 12 additions and 10 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.35.3
TERMUX_PKG_VERSION=2.36.0
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
TERMUX_PKG_SHA256=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
TERMUX_PKG_DEPENDS="libcurl, libiconv, less, openssl, pcre2, zlib"
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:

View File

@ -1,23 +1,25 @@
Set uname_S to Linux instead of detecting build machine.
Android does not support -lrt.
diff -u -r ../git-2.10.0/config.mak.uname ./config.mak.uname
--- ../git-2.10.0/config.mak.uname 2016-09-02 21:59:09.000000000 -0400
+++ ./config.mak.uname 2016-09-03 17:27:41.964893344 -0400
@@ -1,6 +1,6 @@
# Platform specific Makefile tweaks based on uname detection
diff -uNr ../git-2.36.0/config.mak.uname ./config.mak.uname
--- ../git-2.36.0/config.mak.uname 2022-04-18 02:52:38.000000000 -0300
+++ ./config.mak.uname 2022-05-03 21:26:12.831013435 -0300
@@ -4,7 +4,7 @@
# Microsoft's Safe Exception Handling in libraries (such as zlib).
# Typically required for VS2013+/32-bit compilation on Vista+ versions.
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+uname_S := Linux
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
@@ -36,8 +36,6 @@
@@ -55,9 +55,6 @@
HAVE_DEV_TTY = YesPlease
HAVE_CLOCK_GETTIME = YesPlease
HAVE_CLOCK_MONOTONIC = YesPlease
- # -lrt is needed for clock_gettime on glibc <= 2.16
- NEEDS_LIBRT = YesPlease
- HAVE_SYNC_FILE_RANGE = YesPlease
HAVE_GETDELIM = YesPlease
SANE_TEXT_GREP=-a
endif
FREAD_READS_DIRECTORIES = UnfortunatelyYes
BASIC_CFLAGS += -DHAVE_SYSINFO