git: update to 2.35.0.
This commit is contained in:
parent
b0560eeb00
commit
7add3f1151
2 changed files with 2 additions and 35 deletions
|
@ -1,33 +0,0 @@
|
|||
From 7d82342089a80b19e54ac8997d5765a33951499f Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <7d82342089a80b19e54ac8997d5765a33951499f.1637112066.git.congdanhqx@gmail.com>
|
||||
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
||||
<congdanhqx@gmail.com>
|
||||
Date: Wed, 17 Nov 2021 08:19:22 +0700
|
||||
Subject: [PATCH] Makefile: fix parallel build race
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* builtin/bugreport.c includes hook-list.h, hence generated files from
|
||||
it must depend on hook-list.h
|
||||
|
||||
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
|
||||
---
|
||||
Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 241dc322c0..413503b488 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2222,6 +2222,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
|
||||
|
||||
help.sp help.s help.o: command-list.h
|
||||
hook.sp hook.s hook.o: hook-list.h
|
||||
+builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h
|
||||
|
||||
builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
|
||||
builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
|
||||
--
|
||||
2.34.0.rc1
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'git'
|
||||
pkgname=git
|
||||
version=2.34.1
|
||||
version=2.35.0
|
||||
revision=1
|
||||
hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
|
||||
makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
|
||||
|
@ -14,7 +14,7 @@ license="GPL-2.0-only"
|
|||
homepage="https://git-scm.com/"
|
||||
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
|
||||
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
|
||||
checksum=3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c
|
||||
checksum=47e677b475226857ceece569fb6ded8b85838ede97ae1e01bd365ac32a468fc8
|
||||
replaces="git-perl>=0"
|
||||
register_shell=/usr/bin/git-shell
|
||||
python_version=3
|
||||
|
|
Loading…
Reference in a new issue