From 5c947ba296fe95e86c4cb08bf3795152c8382f15 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Thu, 30 Apr 2009 17:22:06 +0000
Subject: Make it build on DragonFly master.

---
 editors/emacs21/Makefile.common   |  6 +++---
 editors/emacs21/files/dragonfly.h | 15 ++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'editors/emacs21')

diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index e716f92784f..a3956fdb720 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/06/03 22:17:00 markd Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/04/30 17:22:06 hasso Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 
@@ -45,8 +45,8 @@ CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
 LDFLAGS+=	-Wl,-z,nocombreloc
 .endif
 
-.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=	-DDFLY_PRE_17_CRT
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=	-DDFLY_CRT_USRLIB
 .endif
 
 PLIST_VARS+=	fns.el
diff --git a/editors/emacs21/files/dragonfly.h b/editors/emacs21/files/dragonfly.h
index 4f17515b805..fdd9e381545 100644
--- a/editors/emacs21/files/dragonfly.h
+++ b/editors/emacs21/files/dragonfly.h
@@ -41,19 +41,12 @@ Boston, MA 02111-1307, USA.  */
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
-#  ifndef DFLY_PRE_17_CRT
-#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
-#  else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#  endif
-#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1
+#ifdef DFLY_CRT_USRLIB
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
 #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
-#else
-#error "Add compiler version magic"
 #endif
 
 #define LD_SWITCH_SYSTEM_1
-- 
cgit v1.2.3