From: Brian Gernhardt <brian@gernhardtsoftware.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Jeremy Huddleston <jeremyhu@apple.com>
Subject: [PATCH 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
Date: Mon, 5 Aug 2013 11:59:22 -0400 [thread overview]
Message-ID: <1375718364-13824-2-git-send-email-brian@gernhardtsoftware.com> (raw)
In-Reply-To: <1375718364-13824-1-git-send-email-brian@gernhardtsoftware.com>
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>
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 82f2e22..7051956 100644
--- a/Makefile
+++ b/Makefile
@@ -1182,6 +1182,9 @@ ifdef NEEDS_SSL_WITH_CRYPTO
else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif
+ifdef APPLE_COMMON_CRYPTO
+ LIB_4_CRYPTO += -framework Security -framework CoreFoundation
+endif
endif
ifdef NEEDS_LIBICONV
ifdef ICONVDIR
@@ -1413,7 +1416,6 @@ ifdef PPC_SHA1
LIB_H += ppc/sha1.h
else
ifdef APPLE_COMMON_CRYPTO
- LIB_4_CRYPTO += -framework Security -framework CoreFoundation
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
SHA1_HEADER = <CommonCrypto/CommonDigest.h>
else
--
1.8.4.rc1.384.g0976a17.dirty
next prev parent reply other threads:[~2013-08-05 15:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-05 15:59 [PATCH 0/3] Fixes for OS X Brian Gernhardt
2013-08-05 15:59 ` Brian Gernhardt [this message]
2013-08-05 16:16 ` [PATCH 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 Jeremy Huddleston Sequoia
2013-08-05 17:52 ` Junio C Hamano
2013-08-06 11:25 ` David Aguilar
2013-08-06 17:24 ` Junio C Hamano
2013-08-05 15:59 ` [PATCH 2/3] OS X: Fix redeclaration of die warning Brian Gernhardt
2013-08-05 16:17 ` Jeremy Huddleston Sequoia
2013-08-05 18:00 ` Junio C Hamano
2013-08-06 11:30 ` David Aguilar
2013-08-05 15:59 ` [PATCH 3/3] t5551: Remove header from curl cookie file Brian Gernhardt
2013-08-06 0:29 ` Dave Borowitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375718364-13824-2-git-send-email-brian@gernhardtsoftware.com \
--to=brian@gernhardtsoftware.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeremyhu@apple.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).