[PATCH] Makefile: Add NEEDS_CRYPTO_WITH_SSL
- From
Brian Gernhardt <brian@gernhardtsoftware.com>
- Date
- Sep 8, 2009, 13:54 UTC
- Message-ID
- <1252418078-68650-1-git-send-email-brian@gernhardtsoftware.com>
The Makefile comment for NEEDS_SSL_WITH_CRYPTO says to define it "if you need -lcrypto with -lssl (Darwin)." However, what it actually does is add -lssl when you use -lcrypto and not the other way around. However, libcrypto contains a majority of the ERR_* functions from OpenSSL (at least on OS X) so we need it both ways.
So, add NEEDS_CRYPTO_WITH_SSL which adds -lcrypto to the OpenSSL link flags and clarify the difference between it and NEEDS_SSL_WITH_CRYPTO.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> ---
Compilation using BLK_SHA1 on OS X 10.5 and 10.6 (at least) is still broken without this patch.
Alex Riesen <raa.lkml@gmail.com> pointed out that just adding LIB_4_CRYPTO to git-imap-send is simpler, but judging from the fact that nobody else has complained about this issue, I'm guessing that the need for -lcrypto when using -lssl is not widespread. (Or BLK_SHA1 isn't getting used much or those who do don't compile git-imap-send with SSL.)
Makefile | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index ce882d0..121be04 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,9 @@ all:: # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # -# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). +# Define NEEDS_CRYPTO_WITH_SSL if you need -lcrypto when using -lssl (Darwin). +# +# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin). # # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). # @@ -707,6 +709,7 @@ ifeq ($(uname_S),SCO_SV) TAR = gtar endif ifeq ($(uname_S),Darwin) + NEEDS_CRYPTO_WITH_SSL = YesPlease NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) @@ -1009,6 +1012,9 @@ ifndef NO_OPENSSL else OPENSSL_LINK = endif + ifdef NEEDS_CRYPTO_WITH_SSL + OPENSSL_LINK += -lcrypto + endif else BASIC_CFLAGS += -DNO_OPENSSL BLK_SHA1 = 1
-- 1.6.4.2.420.g30ecf