From e41142a67aa06841337d4b79c4933cfd84d7bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Sat, 18 Jul 2015 15:32:58 +0200 Subject: [PATCH] git: ship with absolute symlink to git (#10221) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- net/git/Makefile | 2 +- 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 index e264e0973..89ace0ba8 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 e3d42007d..b4920a5b7 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/" || \