From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Sep 2014 19:54:05 +0000 (-0700)
Subject: Merge branch 'jc/config-mak-document-darwin-vs-macosx'
X-Git-Tag: v2.2.0-rc0~156
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/55b6dffd135b51e643f5ebbcf346453a8ceebad0?hp=-c

Merge branch 'jc/config-mak-document-darwin-vs-macosx'

* jc/config-mak-document-darwin-vs-macosx:
config.mak.uname: add hint on uname_R for MacOS X
config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems
---

55b6dffd135b51e643f5ebbcf346453a8ceebad0
diff --combined config.mak.uname
index 15ee15e98c,fde196f63a..a2f380fd8d
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -28,16 -28,13 +28,16 @@@ ifeq ($(uname_S),OSF1
  	NO_NSEC = YesPlease
  endif
  ifeq ($(uname_S),Linux)
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
  	LIBC_CONTAINS_LIBINTL = YesPlease
  	HAVE_DEV_TTY = YesPlease
 +	HAVE_CLOCK_GETTIME = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
@@@ -89,8 -86,13 +89,13 @@@ ifeq ($(uname_S),Darwin
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NEEDS_SSL_WITH_CRYPTO = YesPlease
  	NEEDS_LIBICONV = YesPlease
+ 	# Note: $(uname_R) gives us the underlying Darwin version.
+ 	# - MacOS 10.0.* and MacOS 10.1.0 = Darwin 1.*
+ 	# - MacOS 10.x.* = Darwin (x+4).* for (1 <= x)
+ 	# i.e. "begins with [15678] and a dot" means "10.4.* or older".
  	ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
  		OLD_ICONV = UnfortunatelyYes
+ 		NO_APPLE_COMMON_CRYPTO = YesPlease
  	endif
  	ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
  		NO_STRLCPY = YesPlease
@@@ -106,7 -108,6 +111,7 @@@ ifeq ($(uname_S),SunOS
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease
@@@ -149,7 -150,7 +154,7 @@@
  	endif
  	INSTALL = /usr/ucb/install
  	TAR = gtar
 -	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
 +	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__
  endif
  ifeq ($(uname_O),Cygwin)
  	ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4)
@@@ -168,7 -169,6 +173,7 @@@
  	else
  		NO_REGEX = UnfortunatelyYes
  	endif
 +	HAVE_ALLOCA_H = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@@ -243,7 -243,6 +248,7 @@@ ifeq ($(uname_S),AIX
  endif
  ifeq ($(uname_S),GNU)
  	# GNU/Hurd
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
@@@ -318,7 -317,6 +323,7 @@@ endi
  ifeq ($(uname_S),Windows)
  	GIT_VERSION := $(GIT_VERSION).MSVC
  	pathsep = ;
 +	HAVE_ALLOCA_H = YesPlease
  	NO_PREAD = YesPlease
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
@@@ -327,6 -325,7 +332,6 @@@
  	NO_IPV6 = YesPlease
  	NO_UNIX_SOCKETS = YesPlease
  	NO_SETENV = YesPlease
 -	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MEMMEM = YesPlease
@@@ -354,7 -353,6 +359,7 @@@
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	NATIVE_CRLF = YesPlease
  	DEFAULT_HELP_FORMAT = html
 +	NO_D_INO_IN_DIRENT = YesPlease
  
  	CC = compat/vcbuild/scripts/clink.pl
  	AR = compat/vcbuild/scripts/lib.pl
@@@ -363,17 -361,17 +368,17 @@@
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o
 -	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 -	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
 +	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 +	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
  	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
  	PTHREAD_LIBS =
  	lib =
  ifndef DEBUG
 -	BASIC_CFLAGS += -GL -Os -MT
 +	BASIC_CFLAGS += -GL -Os -MD
  	BASIC_LDFLAGS += -LTCG
  	AR += -LTCG
  else
 -	BASIC_CFLAGS += -Zi -MTd
 +	BASIC_CFLAGS += -Zi -MDd
  endif
  	X = .exe
  endif
@@@ -471,7 -469,6 +476,7 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	pathsep = ;
 +	HAVE_ALLOCA_H = YesPlease
  	NO_PREAD = YesPlease
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
@@@ -479,6 -476,7 +484,6 @@@
  	NO_SYMLINK_HEAD = YesPlease
  	NO_UNIX_SOCKETS = YesPlease
  	NO_SETENV = YesPlease
 -	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MEMMEM = YesPlease
@@@ -503,7 -501,6 +508,7 @@@
  	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	DEFAULT_HELP_FORMAT = html
 +	NO_D_INO_IN_DIRENT = YesPlease
  	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/winansi.o \