Re: [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Nov 9, 2016, 08:18 UTC
- Message-ID
- <11cc8bbd-2e67-f53a-c8f4-2244409fd6af@web.de>
- In-Reply-To
- <20161107172617.tlcrpwbjy2w7aoyc@sigill.intra.peff.net>
On 07.11.16 18:26, Jeff King wrote:
Show 21 quoted lines
> 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 =