Skip to content

Commit

Permalink
db_redis: Fixing Makefile
Browse files Browse the repository at this point in the history
Removing unprotected references to libhiredis_ssl.so
  • Loading branch information
joelbax authored and miconda committed Jun 20, 2023
1 parent 3162c80 commit 52d1959
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/modules/db_redis/Makefile
Expand Up @@ -20,14 +20,14 @@ endif

ifeq ($(HIREDIS_BUILDER),)
HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis_ssl -lhiredis
HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis
ifneq ($(shell ls $(LOCALBASE) | grep libhiredis_ssl.so),)
HIREDISDEFS += -DWITH_SSL
HIREDISLIBS += -lhiredis_ssl
endif
else
HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags)
HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) -lhiredis_ssl
HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs)
HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-)
ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),)
HIREDISDEFS += -DWITH_SSL
Expand All @@ -40,7 +40,7 @@ endif

ifeq ($(HIREDISLIBS),-L -lhiredis)
HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include
HIREDISLIBS = -L/opt/local/lib -lhiredis -lhiredis_ssl
HIREDISLIBS = -L/opt/local/lib -lhiredis
ifneq ($(shell ls /opt/local/lib | grep libhiredis_ssl.so),)
HIREDISDEFS += -DWITH_SSL
HIREDISLIBS += -lhiredis_ssl
Expand Down

0 comments on commit 52d1959

Please sign in to comment.