CVS commit: pkgsrc/editors/emacs24

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Aug 27 08:38:31 UTC 2016

Modified Files:
        pkgsrc/editors/emacs24: Makefile hacks.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/emacs24/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/emacs24/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs24/Makefile
diff -u pkgsrc/editors/emacs24/Makefile:1.47 pkgsrc/editors/emacs24/Makefile:1.48
--- pkgsrc/editors/emacs24/Makefile:1.47        Wed Aug  3 10:22:40 2016
+++ pkgsrc/editors/emacs24/Makefile     Sat Aug 27 08:38:31 2016
@@ -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"

Index: pkgsrc/editors/emacs24/hacks.mk
diff -u pkgsrc/editors/emacs24/hacks.mk:1.5 pkgsrc/editors/emacs24/hacks.mk:1.6
--- pkgsrc/editors/emacs24/hacks.mk:1.5 Tue Aug 23 20:27:40 2016
+++ pkgsrc/editors/emacs24/hacks.mk     Sat Aug 27 08:38:31 2016
@@ -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