diff options
| author | hasso <hasso@pkgsrc.org> | 2009-04-30 17:22:06 +0000 |
|---|---|---|
| committer | hasso <hasso@pkgsrc.org> | 2009-04-30 17:22:06 +0000 |
| commit | cefd3672473eb8899c4c646ab2072cc9d93b61cc (patch) | |
| tree | 4fde1e8b0997eb95236532bb79fb3e64c6f184cf /editors/emacs | |
| parent | 730b090abfda7f359b0fae67018cd9caa0037026 (diff) | |
| download | pkgsrc-cefd3672473eb8899c4c646ab2072cc9d93b61cc.tar.gz | |
Make it build on DragonFly master.
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 6 | ||||
| -rw-r--r-- | editors/emacs/files/dragonfly.h | 15 |
2 files changed, 7 insertions, 14 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 2ba09d62068..b6147ff0c3b 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -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 @@ CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \ ${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: diff --git a/editors/emacs/files/dragonfly.h b/editors/emacs/files/dragonfly.h index 4f17515b805..fdd9e381545 100644 --- a/editors/emacs/files/dragonfly.h +++ b/editors/emacs/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 |