diff options
Diffstat (limited to 'databases/redis-devel/files')
| -rw-r--r-- | databases/redis-devel/files/patch-deps-Makefile | 10 | ||||
| -rw-r--r-- | databases/redis-devel/files/patch-deps-hiredis-Makefile | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile index 9da224428a99..cb057a8e8142 100644 --- a/databases/redis-devel/files/patch-deps-Makefile +++ b/databases/redis-devel/files/patch-deps-Makefile @@ -1,15 +1,15 @@ ---- deps/Makefile.orig 2023-06-29 16:32:01 UTC +--- deps/Makefile.orig 2025-05-28 09:43:59 UTC +++ deps/Makefile -@@ -83,7 +83,7 @@ LUA_LDFLAGS+= $(LDFLAGS) +@@ -110,7 +110,7 @@ else ifeq ($(LUA_DEBUG),yes) LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK else - LUA_CFLAGS+= -O2 + LUA_CFLAGS+= endif - # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more - # challenging to cross-compile lua (and redis). These defines make it easier -@@ -106,7 +106,7 @@ endif + ifeq ($(LUA_COVERAGE),yes) + LUA_CFLAGS += -fprofile-arcs -ftest-coverage +@@ -138,7 +138,7 @@ jemalloc: .make-prerequisites jemalloc: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile index a2789076673c..5084572f7440 100644 --- a/databases/redis-devel/files/patch-deps-hiredis-Makefile +++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile @@ -1,27 +1,27 @@ ---- deps/hiredis/Makefile.orig 2023-07-30 05:48:29 UTC +--- deps/hiredis/Makefile.orig 2025-05-28 09:43:59 UTC +++ deps/hiredis/Makefile -@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a +@@ -15,7 +15,7 @@ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') - + # Installation related variables and target -PREFIX?=/usr/local +PREFIX?=${PREFIX} INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -38,10 +38,8 @@ export REDIS_TEST_CONFIG +@@ -43,10 +43,8 @@ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev # 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++') -OPTIMIZATION?=-O3 WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers -DEBUG_FLAGS?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) -+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) - +-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) $(HIREDIS_CFLAGS) ++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) $(HIREDIS_CFLAGS) + REAL_LDFLAGS=$(LDFLAGS) $(HIREDIS_LDFLAGS) + DYLIBSUFFIX=so -@@ -122,7 +120,16 @@ ifeq ($(uname_S),FreeBSD) +@@ -127,7 +125,16 @@ endif else REAL_CFLAGS+=-pedantic endif |