Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Ondřej Caletka 2015-07-18 15:32:58 +02:00
parent 1b92dfbe60
commit e41142a67a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/git/Makefile
View file

@ -64,7 +64,6 @@ MAKE_FLAGS := \
NO_MKSTEMPS="YesPlease" \ NO_MKSTEMPS="YesPlease" \
NO_GETTEXT="YesPlease" \ NO_GETTEXT="YesPlease" \
NO_UNIX_SOCKETS="YesPlease" \ NO_UNIX_SOCKETS="YesPlease" \
NO_IPV6="YesPlease" \
NO_ICONV="YesPlease" \ NO_ICONV="YesPlease" \
NO_NSEC="YesPlease" \ NO_NSEC="YesPlease" \
NO_PERL="YesPlease" \ NO_PERL="YesPlease" \
@ -88,6 +87,7 @@ define Package/git/install
$(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver
$(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/lib/git-core $(INSTALL_DIR) $(1)/usr/lib/git-core
$(LN) /usr/bin/git $(1)/usr/lib/git-core/git
( cd $(PKG_INSTALL_DIR); $(TAR) \ ( cd $(PKG_INSTALL_DIR); $(TAR) \
--exclude=usr/lib/git-core/git-http-backend \ --exclude=usr/lib/git-core/git-http-backend \
--exclude=usr/lib/git-core/git-http-fetch \ --exclude=usr/lib/git-core/git-http-fetch \

2
net/git/patches/100-convert_builtin.patch
View file

@ -49,7 +49,7 @@
git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS) 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,$^) \ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(LIBS) $(CURL_LIBCURL)
@@ -2277,10 +2269,11 @@ endif @@ -2279,10 +2271,11 @@ endif
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
{ test "$$bindir/" = "$$execdir/" || \ { test "$$bindir/" = "$$execdir/" || \