pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/emacs24 editors/emacs24: Fix build on DragonFly



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6ec5295afd8
branches:  trunk
changeset: 355472:d6ec5295afd8
user:      marino <marino%pkgsrc.org@localhost>
date:      Sat Dec 03 05:00:46 2016 +0000

description:
editors/emacs24: Fix build on DragonFly

I believe the segfault seen during building on DragonFly is a common one
seen by many platforms using GCC 5.x and later.  It's been fixed on Emacs
25 though.  Even though it's a generic GCC 5+ fix, limit it to DragonFly
only for now.  Taken from DPorts (from archives)

diffstat:

 editors/emacs24/Makefile.common |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 8885430484e1 -r d6ec5295afd8 editors/emacs24/Makefile.common
--- a/editors/emacs24/Makefile.common   Sat Dec 03 04:19:05 2016 +0000
+++ b/editors/emacs24/Makefile.common   Sat Dec 03 05:00:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2015/09/07 12:02:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.13 2016/12/03 05:00:46 marino Exp $
 #
 # used by editors/emacs24/Makefile
 # used by editors/emacs24-nox11/Makefile
@@ -52,6 +52,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "DragonFly"
+CFLAGS+=       -fno-builtin-malloc     # Not really DF, but GCC >= 5.0
+.endif
+
 .if (${OPSYS} == "NetBSD") && \
     !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
 # NetBSD with native Clang doesn't provide libgcc, everything is in libc.



Home | Main Index | Thread Index | Old Index