Thu Apr 30 17:22:07 2009 UTC ()
Make it build on DragonFly master.
(hasso)
diff -r1.118 -r1.119 pkgsrc/editors/emacs/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs/files/dragonfly.h
diff -r1.36 -r1.37 pkgsrc/editors/emacs20/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/files/dragonfly.h
diff -r1.5 -r1.6 pkgsrc/editors/emacs21/Makefile.common
diff -r1.2 -r1.3 pkgsrc/editors/emacs21/files/dragonfly.h
diff -r1.89 -r1.90 pkgsrc/editors/xemacs/Makefile
diff -r1.3 -r1.4 pkgsrc/editors/xemacs/files/dragonfly.h
--- pkgsrc/editors/emacs/Makefile 2008/11/10 17:21:34 1.118
+++ pkgsrc/editors/emacs/Makefile 2009/04/30 17:22:06 1.119
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2009/04/30 17:22:06 hasso Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
@@ -53,8 +53,8 @@
${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
-.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
post-extract:
--- pkgsrc/editors/emacs/files/Attic/dragonfly.h 2008/06/02 21:15:42 1.2
+++ pkgsrc/editors/emacs/files/Attic/dragonfly.h 2009/04/30 17:22:06 1.3
@@ -41,19 +41,12 @@
#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
--- pkgsrc/editors/emacs20/Makefile 2008/11/10 17:21:34 1.36
+++ pkgsrc/editors/emacs20/Makefile 2009/04/30 17:22:06 1.37
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/04/30 17:22:06 hasso Exp $
DISTNAME= emacs-20.7
PKGREVISION= 12
@@ -51,8 +51,8 @@
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
.include "options.mk"
--- pkgsrc/editors/emacs20/files/dragonfly.h 2008/07/01 13:22:06 1.2
+++ pkgsrc/editors/emacs20/files/dragonfly.h 2009/04/30 17:22:06 1.3
@@ -41,19 +41,12 @@
#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
--- pkgsrc/editors/emacs21/Makefile.common 2008/06/03 22:17:00 1.5
+++ pkgsrc/editors/emacs21/Makefile.common 2009/04/30 17:22:06 1.6
@@ -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 @@
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
--- pkgsrc/editors/emacs21/files/dragonfly.h 2008/06/03 22:20:35 1.2
+++ pkgsrc/editors/emacs21/files/dragonfly.h 2009/04/30 17:22:07 1.3
@@ -41,19 +41,12 @@
#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
--- pkgsrc/editors/xemacs/Makefile 2008/11/10 17:21:34 1.89
+++ pkgsrc/editors/xemacs/Makefile 2009/04/30 17:22:07 1.90
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2009/04/30 17:22:07 hasso Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= XEmacs text editor version 21
@@ -53,8 +53,8 @@
. endif
.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
CHECK_WRKREF_SKIP= bin/xemacs*
--- pkgsrc/editors/xemacs/files/dragonfly.h 2008/07/01 13:24:34 1.3
+++ pkgsrc/editors/xemacs/files/dragonfly.h 2009/04/30 17:22:07 1.4
@@ -34,19 +34,12 @@
#endif
#define LD_SWITCH_SYSTEM
-#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 UNEXEC "unexelf.o"