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 <[email protected]>

diff --git a/net/git/Makefile b/net/git/Makefile
index e264e097381ecff1b6564e64fa12973892befccd..89ace0ba8eb525fb9659f5ac143858468ebee00f 100644 (file)
--- 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 e3d42007db6410e21d170188c25307c74d88bdcf..b4920a5b73f129f00ea28e1451e917b5faa4af97 100644 (file)
--- 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/" || \