summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2016-08-27 08:38:31 +0000
committermaya <maya@pkgsrc.org>2016-08-27 08:38:31 +0000
commit628e83de3491adac28aa4d5fdd2f2d46b3362405 (patch)
treeca858b5180c594623f1c574233bf48d93e4fdc39
parentd9d9d10c3591546a99251b955f59c79033cdcd5e (diff)
downloadpkgsrc-628e83de3491adac28aa4d5fdd2f2d46b3362405.tar.gz
Disable a specific optimization (-fno-optimize-strlen) instead of using -O0.
Apply this on all netbsd architectures, not just amd64. PR pkg/51439, from stackfield.
-rw-r--r--editors/emacs24/Makefile4
-rw-r--r--editors/emacs24/hacks.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index 8be9fc43f7a..308e7f1acfb 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2016/08/03 10:22:40 adam Exp $
+# $NetBSD: Makefile,v 1.48 2016/08/27 08:38:31 maya Exp $
CONFLICTS+= emacs24-nox11-[0-9]*
-PKGREVISION= 12
+PKGREVISION= 13
.include "../../editors/emacs24/Makefile.common"
.include "options.mk"
diff --git a/editors/emacs24/hacks.mk b/editors/emacs24/hacks.mk
index 8ed8c88e967..1b6116105d0 100644
--- a/editors/emacs24/hacks.mk
+++ b/editors/emacs24/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2016/08/23 20:27:40 maya Exp $
+# $NetBSD: hacks.mk,v 1.6 2016/08/27 08:38:31 maya Exp $
.if !defined(EMACS_HACKS_MK)
EMACS_HACKS_MK= defined
@@ -8,10 +8,10 @@ EMACS_HACKS_MK= defined
### On NetBSD/amd64 7.99.26, gcc optimisation, at least for version 5.x,
### produces, a "temacs" binary which segfaults.
###
-. if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
+. if !empty(MACHINE_PLATFORM:MNetBSD-*)
. if !empty(CC_VERSION:Mgcc-5.*)
PKG_HACKS+= optimisation
-BUILDLINK_TRANSFORM+= opt:-O2:-O0
+CFLAGS+= -fno-optimize-strlen
. endif
. endif