diff options
| author | marino <marino@pkgsrc.org> | 2011-12-08 20:43:28 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2011-12-08 20:43:28 +0000 |
| commit | aa18b90f3d07beaf18a24ebd8013d723e88a8f6f (patch) | |
| tree | 3f6f7ad1505e4d22de7e776551c6de75046e7d40 /editors | |
| parent | ac3e78e63af90501df24a1670a12ef421db36d67 (diff) | |
| download | pkgsrc-aa18b90f3d07beaf18a24ebd8013d723e88a8f6f.tar.gz | |
editors/xemacs: Fix all non-NetBSD platforms
The previous change to PLIST broke all platforms not NetBSD if built under
PKG_DEVELOPER=yes. The netbsd.h header will be present on all platforms,
so it needs to have a dedicated entry in PLIST (as it used to). The
LOWER_OPSYS variable is just wrong in this case.
Secondly, the dragonfly.h file was updated for the default compiler,
allowing this version of xemacs to build again.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/xemacs/PLIST | 4 | ||||
| -rw-r--r-- | editors/xemacs/files/dragonfly.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST index 022ec960674..dd99cfacf3d 100644 --- a/editors/xemacs/PLIST +++ b/editors/xemacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2010/12/16 17:45:12 hauke Exp $ +@comment $NetBSD: PLIST,v 1.20 2011/12/08 20:43:28 marino Exp $ bin/${DISTNAME} bin/ellcc bin/gnuattach @@ -675,7 +675,7 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/isc4-1.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/linux.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/mach-bsd4-3.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/mingw32.h -lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/${LOWER_OPSYS}.h +lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/netbsd.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/newsos5.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/nextstep.h lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/openbsd.h diff --git a/editors/xemacs/files/dragonfly.h b/editors/xemacs/files/dragonfly.h index c89f49609b2..caad7b6707d 100644 --- a/editors/xemacs/files/dragonfly.h +++ b/editors/xemacs/files/dragonfly.h @@ -35,8 +35,7 @@ #define LD_SWITCH_SYSTEM #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 +#define ORDINARY_LINK #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 |