From: "Torsten Bögershausen" <tboegi@web.de>
To: Jeff King <peff@peff.net>, Lars Schneider <larsxschneider@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11
Date: Wed, 9 Nov 2016 09:18:12 +0100 [thread overview]
Message-ID: <11cc8bbd-2e67-f53a-c8f4-2244409fd6af@web.de> (raw)
In-Reply-To: <20161107172617.tlcrpwbjy2w7aoyc@sigill.intra.peff.net>
On 07.11.16 18:26, Jeff King wrote:
> On Sun, Nov 06, 2016 at 08:35:04PM +0100, Lars Schneider wrote:
>
>> Good point. I think I found an even easier way to achieve the same.
>> What do you think about the patch below?
>>
>> [...]
>>
>> diff --git a/Makefile b/Makefile
>> index 9d6c245..f53fcc9 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -1047,6 +1047,7 @@ ifeq ($(uname_S),Darwin)
>> endif
>> endif
>> ifndef NO_APPLE_COMMON_CRYPTO
>> + NO_OPENSSL = YesPlease
>> APPLE_COMMON_CRYPTO = YesPlease
>> COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
>> endif
>
> That is much simpler.
[]
I don't know if that is a correct solution.
If I have Mac OS 10.12 and Mac Ports installed, I may want to use
OPENSSL from Mac Ports.
How about this:
diff --git a/Makefile b/Makefile
index ee89c06..e93511f 100644
--- a/Makefile
+++ b/Makefile
@@ -1038,17 +1038,22 @@ ifeq ($(uname_S),Darwin)
ifeq ($(shell test -d /sw/lib && echo y),y)
BASIC_CFLAGS += -I/sw/include
BASIC_LDFLAGS += -L/sw/lib
+ HAS_OPENSSL = Yes
endif
endif
ifndef NO_DARWIN_PORTS
ifeq ($(shell test -d /opt/local/lib && echo y),y)
BASIC_CFLAGS += -I/opt/local/include
BASIC_LDFLAGS += -L/opt/local/lib
+ HAS_OPENSSL = Yes
endif
endif
ifndef NO_APPLE_COMMON_CRYPTO
APPLE_COMMON_CRYPTO = YesPlease
COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
+ ifndef HAS_OPENSSL
+ NO_OPENSSL = YesPlease
+ endif
endif
NO_REGEX = YesPlease
PTHREAD_LIBS =
next prev parent reply other threads:[~2016-11-09 8:18 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 0:25 [PATCH v1 0/2] Fix default macOS build locally and on Travis CI larsxschneider
2016-10-17 0:25 ` [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11 larsxschneider
2016-10-17 9:50 ` Jeff King
2016-11-06 19:35 ` Lars Schneider
2016-11-07 17:26 ` Jeff King
2016-11-07 17:36 ` Paul Smith
2016-11-07 17:46 ` Jeff King
2016-11-07 17:49 ` Paul Smith
2016-11-09 8:18 ` Torsten Bögershausen [this message]
2016-11-09 9:29 ` Lars Schneider
2016-11-09 10:51 ` Torsten Bögershausen
2016-11-10 11:13 ` [PATCH v2] Makefile: set NO_OPENSSL on macOS by default larsxschneider
2016-10-17 0:25 ` [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS larsxschneider
2016-11-06 21:42 ` Lars Schneider
2016-11-07 21:20 ` Jeff King
2016-11-10 11:07 ` Lars Schneider
2016-11-10 16:10 ` Jeff King
2016-11-10 21:33 ` Junio C Hamano
2016-11-10 21:43 ` Jeff King
2016-11-10 21:49 ` Junio C Hamano
2016-11-10 21:54 ` Jeff King
2016-11-11 8:22 ` Lars Schneider
2016-11-11 8:47 ` Jeff King
2016-11-11 9:13 ` Lars Schneider
2016-11-11 9:28 ` Jeff King
2016-11-15 12:07 ` Heiko Voigt
2016-11-15 14:18 ` Lars Schneider
2016-11-15 15:31 ` Jeff King
2016-11-16 14:39 ` Heiko Voigt
2016-11-16 20:01 ` Torsten Bögershausen
2016-11-09 23:39 ` [PATCH v1 0/2] Fix default macOS build locally and on Travis CI Junio C Hamano
2016-11-10 6:41 ` Torsten Bögershausen
2016-11-10 11:19 ` Lars Schneider
2016-11-10 21:34 ` Junio C Hamano
2016-11-11 9:01 ` Lars Schneider
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11cc8bbd-2e67-f53a-c8f4-2244409fd6af@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).