git: add KISS patch

4 files changed, 114 insertions, 0 deletions

diff --git a/core/git/build b/core/git/build
index c129008c..0a8192a0 100755
--- a/core/git/build
+++ b/core/git/build
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+export CFLAGS="$CFLAGS -fPIC"
+
+patch -p1 < git-tiny.patch
+
 cat > config.mak <<EOF
 NO_GETTEXT=YesPlease
 NO_SVN_TESTS=YesPlease
@@ -8,6 +12,7 @@ NO_EXPAT=YesPlease
 NO_NSEC=YesPlease
 NO_PYTHON=YesPlease
 NO_PERL=YesPlease
+NO_SVN_TESTS=YesPlease
 NO_SYS_POLL_H=1
 NO_CROSS_DIRECTORY_HARDLINKS=1
 NO_INSTALL_HARDLINKS=1
diff --git a/core/git/checksums b/core/git/checksums
index 7cc32d22..72e36eb7 100644
--- a/core/git/checksums
+++ b/core/git/checksums
@@ -1 +1,2 @@
 222796cc6e3bf2f9fd765f8f097daa3c3999bb7865ac88a8c974d98182e29f26  git-2.25.1.tar.xz
+5c8d1028854fb5a8f703ff5dc161de05c792c6d87f0b9443f247a5865f160353  git-tiny.patch
diff --git a/core/git/patches/git-tiny.patch b/core/git/patches/git-tiny.patch
new file mode 100644
index 00000000..98e1baad
--- /dev/null
+++ b/core/git/patches/git-tiny.patch
@@ -0,0 +1,107 @@
+--- Makefile
++++ Makefile
+@@ -809,9 +809,7 @@
+ 
+ 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 += command-list.h
+ 
+@@ -1158,7 +1156,7 @@
+ 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)
+@@ -1199,7 +1197,7 @@
+ endif
+ 
+ ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+-ALL_LDFLAGS = $(LDFLAGS)
++ALL_LDFLAGS = $(LDFLAGS) -Wl,-rpath,$(gitexecdir_SQ)
+ 
+ comma := ,
+ empty :=
+@@ -1875,7 +1873,7 @@
+ ifndef V
+ 	QUIET_CC       = @echo '   ' CC $@;
+ 	QUIET_AR       = @echo '   ' AR $@;
+-	QUIET_LINK     = @echo '   ' LINK $@;
++	QUIET_LINK     = @echo '   ' CCLD $@;
+ 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
+ 	QUIET_GEN      = @echo '   ' GEN $@;
+ 	QUIET_LNCP     = @echo '   ' LN/CP $@;
+@@ -2118,7 +2116,7 @@
+ 	'-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)
+ 
+@@ -2457,9 +2455,8 @@
+ 	$(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) $@ && \
+@@ -2471,14 +2468,8 @@
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+ 
+-$(LIB_FILE): $(LIB_OBJS)
+-	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+-
+-$(XDIFF_LIB): $(XDIFF_OBJS)
+-	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+-
+-$(VCSSVN_LIB): $(VCSSVN_OBJS)
+-	$(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
+ 
+@@ -2754,9 +2745,9 @@
+ 
+ .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)
+ 
+@@ -2876,6 +2867,7 @@
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
++	$(INSTALL) $(LIB_FILE) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ 	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ 	$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+ ifdef MSVC
+@@ -3096,7 +3088,7 @@
+ clean: profile-clean coverage-clean cocciclean
+ 	$(RM) *.res
+ 	$(RM) $(OBJECTS)
+-	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
++	$(RM) $(LIB_FILE)
+ 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
+ 	$(RM) $(TEST_PROGRAMS)
+ 	$(RM) $(FUZZ_PROGRAMS)
diff --git a/core/git/sources b/core/git/sources
index 08aae9fe..3b4a1039 100644
--- a/core/git/sources
+++ b/core/git/sources
@@ -1 +1,2 @@
 https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz
+patches/git-tiny.patch