diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2021-12-30 18:24:39 +0100 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-01-18 18:06:07 -0800 |
| commit | 042bf16072627d763ba22a4d80c03cb32406a936 (patch) | |
| tree | 4e64ab70c211d1ec55883348230471b20c82a4dc /net/git/patches | |
| parent | 9f0fdb0ee26b464609eea04deee3fb3b13a2d79a (diff) | |
git: update to version 2.34.1
- Refreshed patches
- Release notes 2.34.0:
https://github.com/git/git/blob/2ae0a9cb8298185a94e5998086f380a355dd8907/Documentation/RelNotes/2.34.0.txt
- Release notes 2.34.1:
https://github.com/git/git/blob/2ae0a9cb8298185a94e5998086f380a355dd8907/Documentation/RelNotes/2.34.1.txt
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Diffstat (limited to 'net/git/patches')
| -rw-r--r-- | net/git/patches/200-imapsend_without_curl.patch | 2 | ||||
| -rw-r--r-- | net/git/patches/310-fix-uname-detection-for-crosscompiling | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 38c17c25c..126058faa 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1448,7 +1448,7 @@ else +@@ -1436,7 +1436,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/git/patches/310-fix-uname-detection-for-crosscompiling b/net/git/patches/310-fix-uname-detection-for-crosscompiling index 0402a8f41..4b884d298 100644 --- a/net/git/patches/310-fix-uname-detection-for-crosscompiling +++ b/net/git/patches/310-fix-uname-detection-for-crosscompiling @@ -39,5 +39,5 @@ Signed-off-by: Mauro Condarelli <mc5686 at mclink.it> +uname_P ?= $(shell sh -c 'uname -p 2>/dev/null || echo not') +uname_V ?= $(shell sh -c 'uname -v 2>/dev/null || echo not') - ifdef MSVC - # avoid the MingW and Cygwin configuration sections + ifneq ($(findstring MINGW,$(uname_S)),) + uname_S := MINGW |