lede-packages-rs

commit 439f623c0bcf60d44e142a459a14df2fc41ae397
parent 1b92dfbe609b42a3f25fcfe17ba29102525d7a79
Author: tripolar <tripolar@users.noreply.github.com>
Date:   Fri, 24 Jul 2015 22:20:59 +0200

Merge pull request #1588 from oskar456/gitfix

git: Fix broken git symlink, add IPv6 support
Diffstat:
M
net/git/Makefile
 | 
2
+-
M
net/git/patches/100-convert_builtin.patch
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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/" || \