diff options
| author | maya <maya@pkgsrc.org> | 2016-11-11 10:54:41 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2016-11-11 10:54:41 +0000 |
| commit | e2260e8a4f06bc6d76824e2e408f2a727f61d988 (patch) | |
| tree | e3c4cc14a81ddbece9786308171553a43847744b /editors | |
| parent | 659423573c574380818a3d649f5544cc7fdf2f1a (diff) | |
| download | pkgsrc-e2260e8a4f06bc6d76824e2e408f2a727f61d988.tar.gz | |
emacs21: remove convoluted logic for using binutils hack -- use it
unconditionally here too. it's highly unlikely someone has such old
binutils.
bump PKGREVISION - it causes runtime crashes.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs21/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs21/Makefile.common | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index 9a6cde9fc26..e62e550b409 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2016/07/09 06:38:14 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2016/11/11 10:54:41 maya Exp $ -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= editors CONFLICTS+= emacs21-nox11-[0-9]* diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common index deb05974c38..9675f2cb386 100644 --- a/editors/emacs21/Makefile.common +++ b/editors/emacs21/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2016/02/25 12:22:40 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.17 2016/11/11 10:54:41 maya Exp $ # # used by editors/emacs21/Makefile # used by editors/emacs21-nox11/Makefile @@ -39,19 +39,10 @@ INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} .include "../../mk/bsd.prefs.mk" -# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1. -.if (${OPSYS} == "NetBSD" && \ - (empty(OS_VERSION:M1.[0-5]*) && \ - empty(OS_VERSION:M1.6_*) && \ - empty(OS_VERSION:M1.6) && \ - empty(OS_VERSION:M1.6.[0-9]*) && \ - empty(OS_VERSION:M1.6[A-P]*))) || \ - ${OPSYS} == "DragonFly" # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc # sections and .data reloc sections, both of which Emacs can't handle # properly. Analyzed by Stephen Ma. LDFLAGS+= -Wl,-z,nocombreloc -.endif # Use terminfo on NetBSD-6. # We cannot use terminfo.*.mk as emacs WILL force a link to termcap, |