From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:55:48 +0000 (-0700)
Subject: Merge branch 'da/darwin'
X-Git-Tag: v1.8.4-rc0~234
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/527b1719f583ed56653b6d296422968e86f62d59?ds=inline;hp=-c

Merge branch 'da/darwin'

Newer MacOS X encourages the programs to compile and link with
their CommonCrypto, not with OpenSSL.

* da/darwin:
imap-send: eliminate HMAC deprecation warnings on Mac OS X
cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
Makefile: add support for Apple CommonCrypto facility
Makefile: fix default regex settings on Darwin
---

527b1719f583ed56653b6d296422968e86f62d59
diff --combined Makefile
index 4bbb2583ec,5e7cadf017..47f3e3cb12
--- a/Makefile
+++ b/Makefile
@@@ -69,9 -69,6 +69,9 @@@ all:
  # Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt
  # doesn't support GNU extensions like --check and --statistics
  #
 +# Define NEEDS_CLIPPED_WRITE if your write(2) cannot write more than
 +# INT_MAX bytes at once (e.g. MacOS X).
 +#
  # Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
  # it specifies.
  #
@@@ -140,6 -137,10 +140,10 @@@
  # specify your own (or DarwinPort's) include directories and
  # library directories by defining CFLAGS and LDFLAGS appropriately.
  #
+ # Define NO_APPLE_COMMON_CRYPTO if you are building on Darwin/Mac OS X
+ # and do not want to use Apple's CommonCrypto library.  This allows you
+ # to provide your own OpenSSL library, for example from MacPorts.
+ #
  # Define BLK_SHA1 environment variable to make use of the bundled
  # optimized C SHA1 routine.
  #
@@@ -463,7 -464,6 +467,7 @@@ SCRIPT_SH += git-mergetool.s
  SCRIPT_SH += git-pull.sh
  SCRIPT_SH += git-quiltimport.sh
  SCRIPT_SH += git-rebase.sh
 +SCRIPT_SH += git-remote-testgit.sh
  SCRIPT_SH += git-repack.sh
  SCRIPT_SH += git-request-pull.sh
  SCRIPT_SH += git-stash.sh
@@@ -688,6 -688,7 +692,6 @@@ LIB_H += notes-cache.
  LIB_H += notes-merge.h
  LIB_H += notes.h
  LIB_H += object.h
 -LIB_H += pack-refs.h
  LIB_H += pack-revindex.h
  LIB_H += pack.h
  LIB_H += parse-options.h
@@@ -820,6 -821,7 +824,6 @@@ LIB_OBJS += notes-cache.
  LIB_OBJS += notes-merge.o
  LIB_OBJS += object.o
  LIB_OBJS += pack-check.o
 -LIB_OBJS += pack-refs.o
  LIB_OBJS += pack-revindex.o
  LIB_OBJS += pack-write.o
  LIB_OBJS += pager.o
@@@ -1056,6 -1058,11 +1060,11 @@@ ifeq ($(uname_S),Darwin
  			BASIC_LDFLAGS += -L/opt/local/lib
  		endif
  	endif
+ 	ifndef NO_APPLE_COMMON_CRYPTO
+ 		APPLE_COMMON_CRYPTO = YesPlease
+ 		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
+ 	endif
+ 	NO_REGEX = YesPlease
  	PTHREAD_LIBS =
  endif
  
@@@ -1389,11 -1396,17 +1398,17 @@@ ifdef PPC_SHA
  	SHA1_HEADER = "ppc/sha1.h"
  	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
  	LIB_H += ppc/sha1.h
+ else
+ ifdef APPLE_COMMON_CRYPTO
+ 	COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
+ 	SHA1_HEADER = <CommonCrypto/CommonDigest.h>
  else
  	SHA1_HEADER = <openssl/sha.h>
  	EXTLIBS += $(LIB_4_CRYPTO)
  endif
  endif
+ endif
+ 
  ifdef NO_PERL_MAKEMAKER
  	export NO_PERL_MAKEMAKER
  endif
@@@ -1468,11 -1481,6 +1483,11 @@@ ifndef NO_MSGFMT_EXTENDED_OPTION
  	MSGFMT += --check --statistics
  endif
  
 +ifdef NEEDS_CLIPPED_WRITE
 +	BASIC_CFLAGS += -DNEEDS_CLIPPED_WRITE
 +	COMPAT_OBJS += compat/clipped-write.o
 +endif
 +
  ifneq (,$(XDL_FAST_HASH))
  	BASIC_CFLAGS += -DXDL_FAST_HASH
  endif
@@@ -2011,7 -2019,6 +2026,7 @@@ endi
  ifdef USE_NED_ALLOCATOR
  compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
  	-DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
 +compat/nedmalloc/nedmalloc.sp: SPARSE_FLAGS += -Wno-non-pointer-null
  endif
  
  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
@@@ -2167,9 -2174,6 +2182,9 @@@ GIT-BUILD-OPTIONS: FORC
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
  	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
  	@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@
 +ifdef TEST_OUTPUT_DIRECTORY
 +	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@
 +endif
  ifdef GIT_TEST_OPTS
  	@echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_OPTS)))'\' >>$@
  endif