Update to 1.7.0.5 for Solaris 2.6

This commit is contained in:
Tom G. Christensen
2010-04-22 08:29:57 +00:00
committed by Tom G. Christensen
parent c6e6c27c5f
commit 2c7daf629a
3 changed files with 49 additions and 79 deletions

View File

@@ -1,24 +0,0 @@
--- git-1.5.5.1/Makefile.sunos56 2008-05-12 17:05:44.916828000 +0200
+++ git-1.5.5.1/Makefile 2008-05-12 17:06:54.787133000 +0200
@@ -573,6 +573,21 @@
NO_MEMMEM = YesPlease
NO_HSTRERROR = YesPlease
NO_MKDTEMP = YesPlease
+ ifeq ($(uname_R),5.6)
+ NEEDS_LIBICONV = YesPlease
+ NO_UNSETENV = YesPlease
+ NO_SETENV = YesPlease
+ NO_C99_FORMAT = YesPlease
+ NO_STRTOUMAX = YesPlease
+ NO_D_TYPE_IN_DIRENT = YesPlease
+ NO_SOCKADDR_STORAGE = YesPlease
+ NO_STRCASESTR = YesPlease
+ NO_STRLCPY = YesPlease
+ NO_STRTOUMAX = YesPlease
+ NO_IPV6 = YesPlease
+ NO_SOCKLEN_T = YesPlease
+ EXTLIBS += -lresolv
+ endif
ifeq ($(uname_R),5.8)
NEEDS_LIBICONV = YesPlease
NO_UNSETENV = YesPlease

View File

@@ -1,22 +0,0 @@
--- git-1.6.0.2/Makefile.orig 2008-10-04 20:39:42.864022000 +0200
+++ git-1.6.0.2/Makefile 2008-10-04 20:42:18.194159000 +0200
@@ -1125,7 +1125,6 @@
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
- ln git$X $@ 2>/dev/null || \
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
@@ -1387,10 +1386,9 @@
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
{ $(RM) "$$execdir/git-add$X" && \
- ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \
+ ln -s git-add$X "$$execdir/git-add$X" 2>/dev/null || \
cp git-add$X "$$execdir/git-add$X"; } && \
{ $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
- ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \
ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \
cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"