diff options
| author | Yunier Pérez <yunier.soad@gmail.com> | 2021-09-30 07:51:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 15:51:19 +0300 |
| commit | 12e4f31d94ff2f6231a147b1578a4efcb0a29a7c (patch) | |
| tree | f29d713f9ee1ec12a6f9dce4d25e10c5730fd588 | |
| parent | ffafb434fb50b5697d1aa35342721eaa5f13e0eb (diff) | |
| download | redis-12e4f31d94ff2f6231a147b1578a4efcb0a29a7c.tar.gz | |
Allow to override OPENSSL_PREFIX (#9567)
While the original issue was on Linux, this should work for other
platforms as well.
| -rw-r--r-- | deps/hiredis/Makefile | 7 | ||||
| -rw-r--r-- | src/Makefile | 16 |
2 files changed, 16 insertions, 7 deletions
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile index a8d37a2eb..7e41c97a5 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile @@ -77,7 +77,12 @@ ifeq ($(USE_SSL),1) endif ifeq ($(uname_S),Linux) - SSL_LDFLAGS=-lssl -lcrypto + ifdef OPENSSL_PREFIX + CFLAGS+=-I$(OPENSSL_PREFIX)/include + SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto + else + SSL_LDFLAGS=-lssl -lcrypto + endif else OPENSSL_PREFIX?=/usr/local/opt/openssl CFLAGS+=-I$(OPENSSL_PREFIX)/include diff --git a/src/Makefile b/src/Makefile index 595231ca4..4930bbb7d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -121,15 +121,11 @@ ifeq ($(uname_S),Darwin) # must be referenced explicitly during build. ifeq ($(uname_M),arm64) # Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX - OPENSSL_PREFIX=/opt/homebrew/opt/openssl + OPENSSL_PREFIX?=/opt/homebrew/opt/openssl else # Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX - OPENSSL_PREFIX=/usr/local/opt/openssl + OPENSSL_PREFIX?=/usr/local/opt/openssl endif -OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include -OPENSSL_LDFLAGS=-L$(OPENSSL_PREFIX)/lib -# Also export OPENSSL_PREFIX so it ends up in deps sub-Makefiles -export OPENSSL_PREFIX else ifeq ($(uname_S),AIX) # AIX @@ -190,6 +186,14 @@ endif endif endif endif + +ifdef OPENSSL_PREFIX + OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include + OPENSSL_LDFLAGS=-L$(OPENSSL_PREFIX)/lib + # Also export OPENSSL_PREFIX so it ends up in deps sub-Makefiles + export OPENSSL_PREFIX +endif + # Include paths to dependencies FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram |