Mon Sep 27 15:26:25 2021 UTC ()
emacs: segfaults when built with MKPIE


(nia)
diff -r1.19 -r1.20 pkgsrc/editors/emacs21/Makefile.common
diff -r1.6 -r1.7 pkgsrc/editors/emacs25/Makefile.common
diff -r1.3 -r1.4 pkgsrc/editors/emacs26/Makefile.common
diff -r1.1 -r1.2 pkgsrc/editors/emacs27/Makefile.common
cvs diff -r1.19 -r1.20 pkgsrc/editors/emacs21/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile.common 2020/01/18 23:30:45 1.19
+++ pkgsrc/editors/emacs21/Makefile.common 2021/09/27 15:26:24 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2020/01/18 23:30:45 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.20 2021/09/27 15:26:24 nia Exp $
2# 2#
3# used by editors/emacs21/Makefile 3# used by editors/emacs21/Makefile
4# used by editors/emacs21-nox11/Makefile 4# used by editors/emacs21-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACSVERSION}a 6DISTNAME= emacs-${EMACSVERSION}a
7PKGNAME?= emacs21-${EMACSVERSION}a 7PKGNAME?= emacs21-${EMACSVERSION}a
8 8
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gnu.org/software/emacs/emacs.html 11HOMEPAGE= https://www.gnu.org/software/emacs/emacs.html
12COMMENT= GNU editing macros (editor) 12COMMENT= GNU editing macros (editor)
13 13
14CONFLICTS= mule-[0-9]* 14CONFLICTS= mule-[0-9]*
@@ -27,26 +27,28 @@ WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION} @@ -27,26 +27,28 @@ WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION}
27PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q} 27PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q}
28 28
29MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp 29MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
30 30
31# build PATH in the dumped emacs is not a problem 31# build PATH in the dumped emacs is not a problem
32CHECK_WRKREF_SKIP+= bin/emacs 32CHECK_WRKREF_SKIP+= bin/emacs
33CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION} 33CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION}
34 34
35CONFIGURE_ARGS+= --srcdir=${WRKSRC} 35CONFIGURE_ARGS+= --srcdir=${WRKSRC}
36INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 36INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
37INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 37INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
38INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} 38INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
39 39
 40MKPIE_SUPPORTED= no
 41
40.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
41 43
42# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc 44# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
43# sections and .data reloc sections, both of which Emacs can't handle 45# sections and .data reloc sections, both of which Emacs can't handle
44# properly. Analyzed by Stephen Ma. 46# properly. Analyzed by Stephen Ma.
45LDFLAGS+= -Wl,-z,nocombreloc 47LDFLAGS+= -Wl,-z,nocombreloc
46 48
47# Use terminfo on NetBSD-6. 49# Use terminfo on NetBSD-6.
48# We cannot use terminfo.*.mk as emacs WILL force a link to termcap, 50# We cannot use terminfo.*.mk as emacs WILL force a link to termcap,
49# but this is fine for us. 51# but this is fine for us.
50.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 52.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
51CPPFLAGS+= -DTERMINFO 53CPPFLAGS+= -DTERMINFO
52.endif 54.endif
cvs diff -r1.6 -r1.7 pkgsrc/editors/emacs25/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs25/Makefile.common 2020/05/22 05:51:19 1.6
+++ pkgsrc/editors/emacs25/Makefile.common 2021/09/27 15:26:24 1.7
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile.common,v 1.6 2020/05/22 05:51:19 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.7 2021/09/27 15:26:24 nia Exp $
2# 2#
3# used by editors/emacs25/Makefile 3# used by editors/emacs25/Makefile
4# used by editors/emacs25-nox11/Makefile 4# used by editors/emacs25-nox11/Makefile
5 5
 6MKPIE_SUPPORTED= no
 7
6.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
7 9
8DISTNAME= emacs-${EMACS_VERSION} 10DISTNAME= emacs-${EMACS_VERSION}
9PKGNAME?= ${DISTNAME:S/emacs/emacs25/} 11PKGNAME?= ${DISTNAME:S/emacs/emacs25/}
10CATEGORIES= editors 12CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 13MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12 14
13MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://www.gnu.org/software/emacs/ 16HOMEPAGE= https://www.gnu.org/software/emacs/
15COMMENT= GNU editing macros (editor) 17COMMENT= GNU editing macros (editor)
16LICENSE= gnu-gpl-v3 18LICENSE= gnu-gpl-v3
17 19
18WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 20WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs26/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs26/Makefile.common 2019/06/08 10:40:54 1.3
+++ pkgsrc/editors/emacs26/Makefile.common 2021/09/27 15:26:24 1.4
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile.common,v 1.3 2019/06/08 10:40:54 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.4 2021/09/27 15:26:24 nia Exp $
2# 2#
3# used by editors/emacs26/Makefile 3# used by editors/emacs26/Makefile
4# used by editors/emacs26-nox11/Makefile 4# used by editors/emacs26-nox11/Makefile
5 5
 6MKPIE_SUPPORTED= no
 7
6.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
7 9
8DISTNAME= emacs-${EMACS_VERSION} 10DISTNAME= emacs-${EMACS_VERSION}
9PKGNAME?= ${DISTNAME:S/emacs/emacs26/} 11PKGNAME?= ${DISTNAME:S/emacs/emacs26/}
10CATEGORIES= editors 12CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 13MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12 14
13MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://www.gnu.org/software/emacs/ 16HOMEPAGE= https://www.gnu.org/software/emacs/
15COMMENT= GNU editing macros (editor) 17COMMENT= GNU editing macros (editor)
16LICENSE= gnu-gpl-v3 18LICENSE= gnu-gpl-v3
17 19
18WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 20WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs27/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs27/Makefile.common 2020/08/12 14:14:48 1.1
+++ pkgsrc/editors/emacs27/Makefile.common 2021/09/27 15:26:25 1.2
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile.common,v 1.1 2020/08/12 14:14:48 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.2 2021/09/27 15:26:25 nia Exp $
2# 2#
3# used by editors/emacs27/Makefile 3# used by editors/emacs27/Makefile
4# used by editors/emacs27-nox11/Makefile 4# used by editors/emacs27-nox11/Makefile
5 5
 6MKPIE_SUPPORTED= no
 7
6.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
7 9
8DISTNAME= emacs-${EMACS_VERSION} 10DISTNAME= emacs-${EMACS_VERSION}
9PKGNAME?= ${DISTNAME:S/emacs/emacs27/} 11PKGNAME?= ${DISTNAME:S/emacs/emacs27/}
10CATEGORIES= editors 12CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 13MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12 14
13MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://www.gnu.org/software/emacs/ 16HOMEPAGE= https://www.gnu.org/software/emacs/
15COMMENT= GNU editing macros (editor) 17COMMENT= GNU editing macros (editor)
16LICENSE= gnu-gpl-v3 18LICENSE= gnu-gpl-v3
17 19
18WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 20WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}