From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 May 2009 23:18:02 +0000 (-0700)
Subject: Merge branch 'jc/solaris-0811'
X-Git-Tag: v1.6.4-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/714cdcd03e2caac6e2dc8d94debc7c800742f546?ds=inline;hp=-c

Merge branch 'jc/solaris-0811'

* jc/solaris-0811:
OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
---

714cdcd03e2caac6e2dc8d94debc7c800742f546
diff --combined Makefile
index ab6f6e14eb,a23846b7c0..0ab1cff30d
--- a/Makefile
+++ b/Makefile
@@@ -175,9 -175,6 +175,9 @@@ all:
  # Define OBJECT_CREATION_USES_RENAMES if your operating systems has problems
  # when hardlinking a file to another name and unlinking the original file right
  # away (some NTFS drivers seem to zero the contents in that scenario).
 +#
 +# Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
 +# programs as a tar, where bin/ and libexec/ might be on different file systems.
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -228,7 -225,6 +228,7 @@@ ETC_GITCONFIG = etc/gitconfi
  endif
  lib = lib
  # DESTDIR=
 +pathsep = :
  
  # default configuration for gitweb
  GITWEB_CONFIG = gitweb_config.perl
@@@ -336,6 -332,7 +336,6 @@@ PROGRAMS += git-index-pack$
  PROGRAMS += git-merge-index$X
  PROGRAMS += git-merge-tree$X
  PROGRAMS += git-mktag$X
 -PROGRAMS += git-mktree$X
  PROGRAMS += git-pack-redundant$X
  PROGRAMS += git-patch-id$X
  PROGRAMS += git-shell$X
@@@ -589,7 -586,6 +589,7 @@@ BUILTIN_OBJS += builtin-merge-base.
  BUILTIN_OBJS += builtin-merge-file.o
  BUILTIN_OBJS += builtin-merge-ours.o
  BUILTIN_OBJS += builtin-merge-recursive.o
 +BUILTIN_OBJS += builtin-mktree.o
  BUILTIN_OBJS += builtin-mv.o
  BUILTIN_OBJS += builtin-name-rev.o
  BUILTIN_OBJS += builtin-pack-objects.o
@@@ -702,7 -698,9 +702,9 @@@ ifeq ($(uname_S),SunOS
  	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_MKDTEMP = YesPlease
- 	OLD_ICONV = UnfortunatelyYes
+ 	ifneq ($(uname_R),5.11)
+ 		OLD_ICONV = UnfortunatelyYes
+ 	endif
  	ifeq ($(uname_R),5.8)
  		NO_UNSETENV = YesPlease
  		NO_SETENV = YesPlease
@@@ -817,7 -815,6 +819,7 @@@ ifneq (,$(findstring CYGWIN,$(uname_S))
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
 +	pathsep = ;
  	NO_PREAD = YesPlease
  	NO_OPENSSL = YesPlease
  	NO_CURL = YesPlease
@@@ -1254,6 -1251,7 +1256,6 @@@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
 -	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
  	    $@.sh >$@+ && \
@@@ -1272,7 -1270,7 +1274,7 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % 
  	sed -e '1{' \
  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
  	    -e '	h' \
 -	    -e '	s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
 +	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
  	    -e '	H' \
  	    -e '	x' \
  	    -e '}' \
@@@ -1554,7 -1552,6 +1556,7 @@@ endi
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  	{ $(RM) "$$execdir/git-add$X" && \
 +		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
  		ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
  	{ for p in $(filter-out git-add$X,$(BUILT_INS)); do \