diff options
| author | marino <marino> | 2016-12-03 05:00:46 +0000 |
|---|---|---|
| committer | marino <marino> | 2016-12-03 05:00:46 +0000 |
| commit | 3fd215321a076c89cc99e566f0761c63ca9e212d (patch) | |
| tree | b3684f5f1c2328a6099e0a1949d4764eb0a48307 /editors | |
| parent | ba7b16b6f9647d6a7fcba36ab564068e27558019 (diff) | |
| download | pkgsrc-3fd215321a076c89cc99e566f0761c63ca9e212d.tar.gz | |
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 (limited to 'editors')
| -rw-r--r-- | editors/emacs24/Makefile.common | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common index 860bf12c6be..096e8b5f3db 100644 --- a/editors/emacs24/Makefile.common +++ b/editors/emacs24/Makefile.common @@ -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 @@ CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} .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. |