pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/editors Build the XEmacsen with CFLAGS=-no-pie for new...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5591daf0954c
branches:  trunk
changeset: 394417:5591daf0954c
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Thu Apr 11 16:05:24 2019 +0000

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

diffstat:

 editors/xemacs-current-nox11/Makefile |   4 ++--
 editors/xemacs-current/Makefile       |   4 ++--
 editors/xemacs-current/hacks.mk       |  16 ++++++++++++++++
 editors/xemacs-nox11/Makefile         |   4 ++--
 editors/xemacs/Makefile               |   4 ++--
 editors/xemacs/hacks.mk               |  16 ++++++++++++++++
 6 files changed, 40 insertions(+), 8 deletions(-)

diffs (92 lines):

diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs-current-nox11/Makefile
--- a/editors/xemacs-current-nox11/Makefile     Thu Apr 11 16:02:37 2019 +0000
+++ b/editors/xemacs-current-nox11/Makefile     Thu Apr 11 16:05:24 2019 +0000
@@ -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
 
diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Thu Apr 11 16:02:37 2019 +0000
+++ b/editors/xemacs-current/Makefile   Thu Apr 11 16:05:24 2019 +0000
@@ -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
diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs-current/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/hacks.mk   Thu Apr 11 16:05:24 2019 +0000
@@ -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
diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Thu Apr 11 16:02:37 2019 +0000
+++ b/editors/xemacs-nox11/Makefile     Thu Apr 11 16:05:24 2019 +0000
@@ -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
diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Thu Apr 11 16:02:37 2019 +0000
+++ b/editors/xemacs/Makefile   Thu Apr 11 16:05:24 2019 +0000
@@ -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
diff -r e41b9699d2f6 -r 5591daf0954c editors/xemacs/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs/hacks.mk   Thu Apr 11 16:05:24 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index