undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1

Browse Source 
It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was
set.  But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see
3ef2bca) so make sure that the appropriate libraries are always set.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Gernhardt 2013-08-05 11:59:22 -04:00 committed by Junio C Hamano
parent 3ef2bcad02
commit c984938f9c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1167,6 +1167,9 @@ ifdef NEEDS_SSL_WITH_CRYPTO
else else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif endif
ifdef APPLE_COMMON_CRYPTO
LIB_4_CRYPTO += -framework Security -framework CoreFoundation
endif
endif endif
ifdef NEEDS_LIBICONV ifdef NEEDS_LIBICONV
ifdef ICONVDIR ifdef ICONVDIR
@ -1398,7 +1401,6 @@ ifdef PPC_SHA1
LIB_H += ppc/sha1.h LIB_H += ppc/sha1.h
else else
ifdef APPLE_COMMON_CRYPTO ifdef APPLE_COMMON_CRYPTO
LIB_4_CRYPTO += -framework Security -framework CoreFoundation
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
SHA1_HEADER = <CommonCrypto/CommonDigest.h> SHA1_HEADER = <CommonCrypto/CommonDigest.h>
else else