With the attached fix the redis port builds, but is unable to complete the 
regression tests (see https://github.com/antirez/redis/issues/4640).

Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile    19 Mar 2018 18:15:57 -0000      1.101
+++ Makefile    6 Apr 2018 13:12:40 -0000
@@ -2,6 +2,7 @@
 
 COMMENT =              persistent key-value database
 DISTNAME =             redis-4.0.8
+REVISION =             0
 CATEGORIES =           databases
 HOMEPAGE =             https://redis.io/
 
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/databases/redis/patches/patch-src_Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 patch-src_Makefile
--- patches/patch-src_Makefile  9 Aug 2017 09:16:09 -0000       1.27
+++ patches/patch-src_Makefile  6 Apr 2018 13:12:40 -0000
@@ -21,7 +21,18 @@ Index: src/Makefile
  INSTALL=install
  
  # Default allocator defaults to Jemalloc if it's not an ARM
-@@ -66,7 +67,7 @@ endif
+@@ -38,6 +39,10 @@ endif
+ endif
+ endif
+ 
++ifeq ($(uname_M),armv7)
++LDFLAGS+=-lc++abi
++endif
++
+ # To get ARM stack traces if Redis crashes we need a special C flag.
+ ifneq (,$(findstring armv,$(uname_M)))
+         CFLAGS+=-funwind-tables
+@@ -66,7 +71,7 @@ endif
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
@@ -30,7 +41,7 @@ Index: src/Makefile
  
  ifeq ($(uname_S),SunOS)
        # SunOS
-@@ -107,7 +108,7 @@ endif
+@@ -107,7 +112,7 @@ endif
  endif
  endif
  # Include paths to dependencies
@@ -39,7 +50,7 @@ Index: src/Makefile
  
  ifeq ($(MALLOC),tcmalloc)
        FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -129,6 +130,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+@@ -129,6 +134,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
  
@@ -50,7 +61,7 @@ Index: src/Makefile
  CCCOLOR="\033[34m"
  LINKCOLOR="\033[34;1m"
  SRCCOLOR="\033[33m"
-@@ -144,7 +149,7 @@ endif
+@@ -144,7 +153,7 @@ endif
  
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
@@ -59,7 +70,7 @@ Index: src/Makefile
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o 
crc64.o
  REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -196,7 +201,7 @@ endif
+@@ -196,7 +205,7 @@ endif
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
@@ -68,7 +79,7 @@ Index: src/Makefile
  
  # redis-sentinel
  $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
-@@ -239,7 +244,7 @@ distclean: clean
+@@ -239,7 +248,7 @@ distclean: clean
  .PHONY: distclean
  
  test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
@@ -77,7 +88,7 @@ Index: src/Makefile
  
  test-sentinel: $(REDIS_SENTINEL_NAME)
        @(cd ..; ./runtest-sentinel)
-@@ -283,10 +288,11 @@ src/help.h:
+@@ -283,10 +292,11 @@ src/help.h:
        @../utils/generate-command-help.rb > help.h
  
  install: all

Reply via email to