mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Makefile: Add NEEDS_CRYPTO_WITH_SSL
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
aaa68dd50f
commit
0460dba4b4
8
Makefile
8
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).
|
||||
#
|
||||
|
@ -704,6 +706,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)
|
||||
|
@ -1007,6 +1010,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
|
||||
|
|
Loading…
Reference in a new issue