2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-12-22 07:10:16 -07:00

git: bump to 2.27.0

This commit is contained in:
Dylan Araps 2020-06-01 22:11:36 +03:00
parent 8a5f380c6f
commit 1a92d8261a
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
4 changed files with 28 additions and 28 deletions

View File

@ -1,3 +1,3 @@
6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848 git-2.26.2.tar.xz
433de104f74a855b7074d88a27e77bf6f0764074e449ffc863f987c124716465 git-manpages-2.26.2.tar.xz
297281cd88154f2c1fadf7dfe07cda679ceca0e9465efb4e4a18d1aa75f9aba8 git-tiny.patch
73ca9774d7fa226e1d87c1909401623f96dca6a044e583b9a762e84d7d1a73f9 git-2.27.0.tar.xz
e6cbab49b04c975886fdddf46eb24c5645c6799224208db8b01143091d9bd49c git-manpages-2.27.0.tar.xz
31ce399971c407e461f1d4b9cada684b48113ad2b296a2860bf2393314e862a4 git-tiny.patch

View File

@ -1,34 +1,34 @@
diff --git a/Makefile b/Makefile
index 9cd9826..26d42a0 100644
index 90aa329..c49f1aa 100644
--- a/Makefile
+++ b/Makefile
@@ -810,9 +810,7 @@ export PYTHON_PATH
@@ -804,9 +804,7 @@ export PYTHON_PATH
TEST_SHELL_PATH = $(SHELL_PATH)
-LIB_FILE = libgit.a
-XDIFF_LIB = xdiff/lib.a
-VCSSVN_LIB = vcs-svn/lib.a
+LIB_FILE = libgit.so
GENERATED_H += config-list.h
GENERATED_H += command-list.h
@@ -1162,7 +1160,7 @@ THIRD_PARTY_SOURCES += compat/regex/%
THIRD_PARTY_SOURCES += sha1collisiondetection/%
THIRD_PARTY_SOURCES += sha1dc/%
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
+GITLIBS = common-main.o $(LIB_FILE)
EXTLIBS =
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -1203,7 +1201,7 @@ include config.mak.dev
endif
ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
+ALL_LDFLAGS = $(LDFLAGS) -Wl,-rpath,$(gitexecdir_SQ)
comma := ,
empty :=
@@ -1882,7 +1880,7 @@ ifneq ($(findstring s,$(MAKEFLAGS)),s)
@ -43,28 +43,28 @@ index 9cd9826..26d42a0 100644
@@ -2125,7 +2123,7 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
-git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
+git$X: GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
$(filter %.o,$^) $(LIBS)
@@ -2464,9 +2462,8 @@ git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
-git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
- $(VCSSVN_LIB)
+git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS)
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
$(QUIET_LNCP)$(RM) $@ && \
@@ -2478,14 +2475,8 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
-$(LIB_FILE): $(LIB_OBJS)
- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-
@ -75,21 +75,21 @@ index 9cd9826..26d42a0 100644
- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+$(LIB_FILE): $(LIB_OBJS) $(BUILTIN_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS) git.o
+ $(QUIET_LINK)$(RM) $@ && $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -lz -lpthread -shared -o $@ $^
export DEFAULT_EDITOR DEFAULT_PAGER
@@ -2761,9 +2752,9 @@ perf: all
.PHONY: test perf
-t/helper/test-line-buffer$X: $(VCSSVN_LIB)
+t/helper/test-line-buffer$X: $(LIB_FILE)
-t/helper/test-svn-fe$X: $(VCSSVN_LIB)
+t/helper/test-svn-fe$X: $(LIB_FILE)
.PRECIOUS: $(TEST_OBJS)
@@ -2882,6 +2873,7 @@ install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'

View File

@ -1,3 +1,3 @@
https://fossies.org/linux/misc/git-2.26.2.tar.xz
https://fossies.org/linux/misc/git-manpages-2.26.2.tar.xz man
https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz
https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-2.27.0.tar.xz man
patches/git-tiny.patch

View File

@ -1 +1 @@
2.26.2 2
2.27.0 1