From: Ondřej Caletka <ondrej@caletka.cz>
Date: Sat, 18 Jul 2015 13:32:58 +0000 (+0200)
Subject: git: ship with absolute symlink to git (#10221)
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e41142a67aa06841337d4b79c4933cfd84d7bace;p=feed%2Fpackages.git

git: ship with absolute symlink to git (#10221)

Fixes regression already fixed in oldpackages commit
012eec3f60a24db1a568d64868a48ea95aedcc87
but re-introduced in commit 6636e13f2ab8992d4eb03a48919ae9ae8da98cee.

This patch also enables IPv6 support.

Signed-off-by: Ondřej Caletka <ondrej@caletka.cz>
---

diff --git a/net/git/Makefile b/net/git/Makefile
index e264e09738..89ace0ba8e 100644
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -64,7 +64,6 @@ MAKE_FLAGS := \
 	NO_MKSTEMPS="YesPlease" \
 	NO_GETTEXT="YesPlease" \
 	NO_UNIX_SOCKETS="YesPlease" \
-	NO_IPV6="YesPlease" \
 	NO_ICONV="YesPlease" \
 	NO_NSEC="YesPlease" \
 	NO_PERL="YesPlease" \
@@ -88,6 +87,7 @@ define Package/git/install
 	$(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin
 	$(INSTALL_DIR) $(1)/usr/lib/git-core
+	$(LN) /usr/bin/git $(1)/usr/lib/git-core/git
 	( cd $(PKG_INSTALL_DIR); $(TAR) \
 		--exclude=usr/lib/git-core/git-http-backend \
 		--exclude=usr/lib/git-core/git-http-fetch \
diff --git a/net/git/patches/100-convert_builtin.patch b/net/git/patches/100-convert_builtin.patch
index e3d42007db..b4920a5b73 100644
--- a/net/git/patches/100-convert_builtin.patch
+++ b/net/git/patches/100-convert_builtin.patch
@@ -49,7 +49,7 @@
  git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL)
-@@ -2277,10 +2269,11 @@ endif
+@@ -2279,10 +2271,11 @@ endif
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  	{ test "$$bindir/" = "$$execdir/" || \