summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-deps-hiredis-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'databases/redis-devel/files/patch-deps-hiredis-Makefile')
-rw-r--r--databases/redis-devel/files/patch-deps-hiredis-Makefile27
1 files changed, 14 insertions, 13 deletions
diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index 1b08c4514d3d..9422ba8d3245 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig 2019-11-29 16:35:59 UTC
-+++ deps/hiredis/Makefile
-@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
+--- deps/hiredis/Makefile.orig 2021-01-12 09:21:03.000000000 -0500
++++ deps/hiredis/Makefile 2021-01-13 11:40:26.109827000 -0500
+@@ -21,7 +21,7 @@
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
# Installation related variables and target
@@ -9,7 +9,7 @@
INCLUDE_PATH?=include/hiredis
LIBRARY_PATH?=lib
PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG
+@@ -44,10 +44,8 @@
# Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -21,11 +21,11 @@
REAL_LDFLAGS=$(LDFLAGS)
DYLIBSUFFIX=so
-@@ -82,6 +80,16 @@ endif
- ifeq ($(uname_S),SunOS)
- REAL_LDFLAGS+= -ldl -lnsl -lsocket
- DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-+endif
+@@ -83,7 +81,16 @@
+ CFLAGS+=-I$(OPENSSL_PREFIX)/include
+ SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+ endif
+-
+ifeq ($(uname_S),FreeBSD)
+ CFLAGS?=$(CFLAGS)
+ CCLINK?=pthread
@@ -34,7 +34,8 @@
+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+ STLIBNAME?=libhiredis.a
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+ SSL_LDFLAGS+= ${OPENSSL_LDFLAGS}
- endif
- ifeq ($(uname_S),Darwin)
- DYLIBSUFFIX=dylib
++ SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+ IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+ ifeq ($(IS_SUN_CC),1)