diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-29 14:04:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-29 14:04:56 +0000 |
| commit | d57c70f35b98b10b26287a9a7dd70a817b7f0ff0 (patch) | |
| tree | bc6ec38ce1a0bc174909b3e318c7bc9bedad3fa9 /editors | |
| parent | 3e670f3c7a435cf8c01e0ee918308a3181b3eb7d (diff) | |
| download | pkgsrc-d57c70f35b98b10b26287a9a7dd70a817b7f0ff0.tar.gz | |
Use -nocombreloc on DragonFly as well. Suggested by Timothy H. Legant
on DragoFly's user list.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile.common | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 5ca6064e7aa..9cc715326a8 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:50:09 rillig Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/29 14:04:56 joerg Exp $ MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} MAINTAINER= markd@NetBSD.org @@ -28,12 +28,13 @@ CHECK_WRKREF_SKIP+= ${PREFIX}/bin/emacs-${EMACSVERSION} .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" && \ +.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]*)) + 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. |