gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Allow to override OPENSSL_PREFIX (#9567)

Browse Source 
While the original issue was on Linux, this should work for other
platforms as well.
This commit is contained in:
Yunier Pérez 2021-09-30 07:51:19 -05:00 committed by Oran Agra
parent c390972c76
commit 664c7b36a5
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/hiredis/Makefile vendored
View File

@ -77,7 +77,12 @@ ifeq ($(USE_SSL),1)
endif endif
ifeq ($(uname_S),Linux) 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 else
OPENSSL_PREFIX?=/usr/local/opt/openssl OPENSSL_PREFIX?=/usr/local/opt/openssl
CFLAGS+=-I$(OPENSSL_PREFIX)/include CFLAGS+=-I$(OPENSSL_PREFIX)/include

16
src/Makefile
View File

@ -121,15 +121,11 @@ ifeq ($(uname_S),Darwin)
# must be referenced explicitly during build. # must be referenced explicitly during build.
ifeq ($(uname_M),arm64) ifeq ($(uname_M),arm64)
# Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX # Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX
OPENSSL_PREFIX=/opt/homebrew/opt/openssl OPENSSL_PREFIX?=/opt/homebrew/opt/openssl
else else
# Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX # Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX
OPENSSL_PREFIX=/usr/local/opt/openssl OPENSSL_PREFIX?=/usr/local/opt/openssl
endif 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 else
ifeq ($(uname_S),AIX) ifeq ($(uname_S),AIX)
# AIX # AIX
@ -190,6 +186,14 @@ endif
endif endif
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 # Include paths to dependencies
FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram