From e8029e48465348c5111db4b93723e108a3a3e164 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Wed, 13 Jan 2021 16:13:24 +0000 Subject: Update databases/redis to the recent stable version 6.0.10. Update CONFLICTS for: o) databases/redis4 o) databases/redis5 o) databases/redis o) databases/redis-devel Connect databases/redis5 to the build. Bump PORTREVISIONs for dependant ports. --- databases/redis/files/patch-src-Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'databases/redis/files/patch-src-Makefile') diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile index 039f8f0dbe1e..6b3ed47b68be 100644 --- a/databases/redis/files/patch-src-Makefile +++ b/databases/redis/files/patch-src-Makefile @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2019-09-25 10:40:18 UTC +--- src/Makefile.orig 2019-11-29 16:35:59 UTC +++ src/Makefile @@ -29,7 +29,7 @@ endif WARN=-Wall -W -Wno-missing-field-initializers @@ -15,11 +15,11 @@ FINAL_LIBS=-lm -DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) - # SunOS -@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin) - # Darwin - FINAL_LIBS+= -ldl + # Linux ARM needs -latomic at linking time + ifneq (,$(filter aarch64 armv,$(uname_M))) +@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) + OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include + OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -120,6 +124,7 @@ else +@@ -131,6 +135,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt -- cgit v1.2.3