On Wed, Apr 18, 2018 at 04:04:43AM +0200, Mark Kettenis wrote:
> I'm travelling and don't have a lot of spare cycles to participate in
> this discussion at the moment.
> 
> I have suggested providing a separate libunwind in base with the LLVM
> unwinder.  I think I even provided a diff at some point.  But it is up
> to you ports guys to decide whether that is helpful or not.  Some
> ports may pick this up automatically but may expect a different
> libunwind implementation and therefore break.
This might work but will definitely need testing.

For now I'd like to unbreak redis on armv7, preferably by removing
-funwind-tables from CFLAGS as suggested by jca.

More Feedback? OK?

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    21 Apr 2018 19:13:00 -0000
@@ -1,8 +1,12 @@
 # $OpenBSD: Makefile,v 1.101 2018/03/19 18:15:57 sthen Exp $
 
 COMMENT =              persistent key-value database
+
 DISTNAME =             redis-4.0.8
+REVISION =             0
+
 CATEGORIES =           databases
+
 HOMEPAGE =             https://redis.io/
 
 MAINTAINER =           David Coppa <dco...@openbsd.org>
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  21 Apr 2018 19:13:00 -0000
@@ -21,6 +21,15 @@ Index: src/Makefile
  INSTALL=install
  
  # Default allocator defaults to Jemalloc if it's not an ARM
+@@ -40,7 +41,7 @@ endif
+ 
+ # To get ARM stack traces if Redis crashes we need a special C flag.
+ ifneq (,$(findstring armv,$(uname_M)))
+-        CFLAGS+=-funwind-tables
++#        CFLAGS+=-funwind-tables
+ endif
+ 
+ # Backwards compatibility for selecting an allocator
 @@ -66,7 +67,7 @@ endif
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)

Reply via email to