From b36536e184d358beb71bbc35239c5e7ce67f9870 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi>
Date: Mon, 14 Apr 2003 03:39:05 +0000
Subject: 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 <stephenm at employees dot org>.

---
 editors/emacs/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'editors/emacs')

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 5c20ecc4a66..562b9b2fea1 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2003/04/12 10:16:39 uebayasi Exp $
+# $NetBSD: Makefile,v 1.54 2003/04/14 03:39:05 uebayasi Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.3
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
@@ -33,6 +34,15 @@ CONFIGURE_ARGS+=	--with-gif
 .include "../../graphics/png/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-png
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.6[Q-Z]*)
+# 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
+
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 		    ccmode message widget reftex forms
 
-- 
cgit v1.2.3