1--- deps/hiredis/Makefile.orig 2023-08-15 09:38:36 UTC 2+++ deps/hiredis/Makefile 3@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a 4 HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') 5 6 # Installation related variables and target 7-PREFIX?=/usr/local 8+PREFIX?=${PREFIX} 9 INCLUDE_PATH?=include/hiredis 10 LIBRARY_PATH?=lib 11 PKGCONF_PATH?=pkgconfig 12@@ -38,10 +38,9 @@ export REDIS_TEST_CONFIG 13 # Fallback to gcc when $CC is not in $PATH. 14 CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') 15 CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') 16-OPTIMIZATION?=-O3 17 WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers 18 DEBUG_FLAGS?= -g -ggdb 19-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) 20+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) 21 REAL_LDFLAGS=$(LDFLAGS) 22 23 DYLIBSUFFIX=so 24@@ -122,7 +121,16 @@ ifeq ($(uname_S),FreeBSD) 25 else 26 REAL_CFLAGS+=-pedantic 27 endif 28- 29+ifeq ($(uname_S),FreeBSD) 30+ CFLAGS?=$(CFLAGS) 31+ CCLINK?=pthread 32+ LDFLAGS?=-L. -Wl,-rpath,. 33+ DYLIBNAME?=libhiredis.so 34+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} 35+ STLIBNAME?=libhiredis.a 36+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} 37+ SSL_LDFLAGS+=${OPENSSL_LDFLAGS} 38+endif 39 ifeq ($(uname_S),SunOS) 40 IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"') 41 ifeq ($(IS_SUN_CC),1) 42