CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Apr 11 16:05:25 UTC 2019

Modified Files:
        pkgsrc/editors/xemacs: Makefile
        pkgsrc/editors/xemacs-current: Makefile
        pkgsrc/editors/xemacs-current-nox11: Makefile
        pkgsrc/editors/xemacs-nox11: Makefile
Added Files:
        pkgsrc/editors/xemacs: hacks.mk
        pkgsrc/editors/xemacs-current: hacks.mk

Log Message:
Build the XEmacsen with CFLAGS=-no-pie for newer gcc versions - the
dumped binary crashes otherwise.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r0 -r1.7 pkgsrc/editors/xemacs/hacks.mk
cvs rdiff -u -r1.98 -r1.99 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/editors/xemacs-current/hacks.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/editors/xemacs-current-nox11/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/xemacs-nox11/Makefile

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

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.122 pkgsrc/editors/xemacs/Makefile:1.123
--- pkgsrc/editors/xemacs/Makefile:1.122        Wed Dec 19 13:29:34 2018
+++ pkgsrc/editors/xemacs/Makefile      Thu Apr 11 16:05:24 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2018/12/19 13:29:34 hauke Exp $
+# $NetBSD: Makefile,v 1.123 2019/04/11 16:05:24 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11

Index: pkgsrc/editors/xemacs-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.98 pkgsrc/editors/xemacs-current/Makefile:1.99
--- pkgsrc/editors/xemacs-current/Makefile:1.98 Wed Dec 19 13:41:45 2018
+++ pkgsrc/editors/xemacs-current/Makefile      Thu Apr 11 16:05:24 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2018/12/19 13:41:45 hauke Exp $
+# $NetBSD: Makefile,v 1.99 2019/04/11 16:05:24 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   6
+PKGREVISION=   7
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11

Index: pkgsrc/editors/xemacs-current-nox11/Makefile
diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.9 pkgsrc/editors/xemacs-current-nox11/Makefile:1.10
--- pkgsrc/editors/xemacs-current-nox11/Makefile:1.9    Wed Dec 19 13:42:12 2018
+++ pkgsrc/editors/xemacs-current-nox11/Makefile        Thu Apr 11 16:05:24 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2018/12/19 13:42:12 hauke Exp $
+# $NetBSD: Makefile,v 1.10 2019/04/11 16:05:24 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
 # Version information in ../../editors/xemacs-current/Makefile.common
 

Index: pkgsrc/editors/xemacs-nox11/Makefile
diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.28 pkgsrc/editors/xemacs-nox11/Makefile:1.29
--- pkgsrc/editors/xemacs-nox11/Makefile:1.28   Wed Dec 19 13:37:42 2018
+++ pkgsrc/editors/xemacs-nox11/Makefile        Thu Apr 11 16:05:24 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2018/12/19 13:37:42 hauke Exp $
+# $NetBSD: Makefile,v 1.29 2019/04/11 16:05:24 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       XEmacs text editor version 21 (no x11 support)
 
 # Version information in ../../editors/xemacs/Makefile.common

Added files:

Index: pkgsrc/editors/xemacs/hacks.mk
diff -u /dev/null pkgsrc/editors/xemacs/hacks.mk:1.7
--- /dev/null   Thu Apr 11 16:05:25 2019
+++ pkgsrc/editors/xemacs/hacks.mk      Thu Apr 11 16:05:24 2019
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.7 2019/04/11 16:05:24 hauke Exp $
+
+.if !defined(XEMACS_HACKS_MK)
+XEMACS_HACKS_MK=       defined
+
+.include "../../mk/compiler.mk"
+
+### Position-independent code does not rhyme well with
+### dumped emacsen.
+###
+.if !empty(CC_VERSION:Mgcc-[6789].*)
+PKG_HACKS+=            disable-gcc-pie
+CFLAGS+=               -no-pie
+.endif
+
+.endif  # XEMACS_HACKS_MK

Index: pkgsrc/editors/xemacs-current/hacks.mk
diff -u /dev/null pkgsrc/editors/xemacs-current/hacks.mk:1.3
--- /dev/null   Thu Apr 11 16:05:25 2019
+++ pkgsrc/editors/xemacs-current/hacks.mk      Thu Apr 11 16:05:24 2019
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.3 2019/04/11 16:05:24 hauke Exp $
+
+.if !defined(XEMACS_CURRENT_HACKS_MK)
+XEMACS_CURRENT_HACKS_MK=       defined
+
+.include "../../mk/compiler.mk"
+
+### Position-independent code does not rhyme well with
+### dumped emacsen.
+###
+.if !empty(CC_VERSION:Mgcc-[6789].*)
+PKG_HACKS+=            disable-gcc-pie
+CFLAGS+=               -no-pie
+.endif
+
+.endif  # XEMACS_CURRENT_HACKS_MK