Sat Dec 15 12:57:57 2012 UTC ()
editors/emacs21-nox11: Hardcode to gcc4.4 on DragonFly instead of gcc 4.1

DragonFly Release 3.2.x doesn't have gcc 4.1 anymore, but gcc 4.4 is
still around and also available on many prior releases.  Note that emacs
24 determines the CRT path dynamically but hardcoding on this obsolete
emacs package is fine.

Incidently, this doesn't fix emacs21 which still core dumps during
installation phase, regardless of which system compiler builds it.


(marino)
diff -r1.3 -r1.4 pkgsrc/editors/emacs21/files/dragonfly.h
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs21/files/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/files/dragonfly.h 2009/04/30 17:22:07 1.3
+++ pkgsrc/editors/emacs21/files/dragonfly.h 2012/12/15 12:57:57 1.4
@@ -32,28 +32,28 @@ Boston, MA 02111-1307, USA. */ @@ -32,28 +32,28 @@ Boston, MA 02111-1307, USA. */
32#undef LDAV_SYMBOL 32#undef LDAV_SYMBOL
33 33
34#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE) 34#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
35 35
36#define LIBS_DEBUG 36#define LIBS_DEBUG
37#define LIBS_SYSTEM -lutil 37#define LIBS_SYSTEM -lutil
38#define SYSV_SYSTEM_DIR 38#define SYSV_SYSTEM_DIR
39 39
40/* freebsd has POSIX-style pgrp behavior. */ 40/* freebsd has POSIX-style pgrp behavior. */
41#undef BSD_PGRPS 41#undef BSD_PGRPS
42#define GETPGRP_NO_ARG 42#define GETPGRP_NO_ARG
43 43
44#ifdef DFLY_CRT_USRLIB 44#ifdef DFLY_CRT_USRLIB
45#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o 45#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc44/crtbegin.o
46#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o 46#define LIB_STANDARD -L/usr/lib/gcc44 -lgcc -lc -lgcc /usr/lib/gcc44/crtend.o /usr/lib/crtn.o
47#else 47#else
48#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 48#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
49#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 49#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
50#endif 50#endif
51 51
52#define LD_SWITCH_SYSTEM_1 52#define LD_SWITCH_SYSTEM_1
53#define UNEXEC unexelf.o 53#define UNEXEC unexelf.o
54#undef LIB_GCC 54#undef LIB_GCC
55#define LIB_GCC 55#define LIB_GCC
56 56
57#define HAVE_WAIT_HEADER 57#define HAVE_WAIT_HEADER
58#define HAVE_GETLOADAVG 1 58#define HAVE_GETLOADAVG 1
59#define HAVE_TERMIOS 59#define HAVE_TERMIOS