diff options
author | marino <marino@pkgsrc.org> | 2011-12-11 21:00:40 +0000 |
---|---|---|
committer | marino <marino@pkgsrc.org> | 2011-12-11 21:00:40 +0000 |
commit | 9968c95b6ee04de815fe5a0318c9e21c3fcea7c4 (patch) | |
tree | 3fcb266ae0fe72db265d81d5c4b9222b5f6750a3 /editors | |
parent | 62309cdc780303d340f0ceb472ad3342a0b4cad9 (diff) | |
download | pkgsrc-9968c95b6ee04de815fe5a0318c9e21c3fcea7c4.tar.gz |
editors/emacs: Fix DragonFly
1) Stop overwriting of alloca on DragonFly
2) Don't overwrite dragonfly.h START_FILES and LIB_STANDARD
3) Remove callouts for gcc41 and gcc44 (specs file handles this)
4) Remove now-unnecessary DFLY_CRT_USRLIB constant
5) New definitions for START_FILES, LIB_STANDARD
6) Specify ORDINARY_LINK
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs/Makefile.common | 6 | ||||
-rw-r--r-- | editors/emacs/distinfo | 4 | ||||
-rw-r--r-- | editors/emacs/files/dragonfly.h | 10 | ||||
-rw-r--r-- | editors/emacs/patches/patch-src_config.in | 20 | ||||
-rw-r--r-- | editors/emacs/patches/patch-src_m_amdx86-64.h | 15 |
5 files changed, 42 insertions, 13 deletions
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 052d5d0ac19..69ef4ee43f3 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2011/12/03 22:46:30 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.31 2011/12/11 21:00:40 marino Exp $ # # used by editors/emacs/Makefile # used by editors/emacs-nox11/Makefile @@ -63,10 +63,6 @@ CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} CFLAGS+= -fno-pie .endif -.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) -CPPFLAGS+= -DDFLY_CRT_USRLIB -.endif - .if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) CPPFLAGS+= -DTERMINFO .elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD" diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 4c47713c991..73b0932576e 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2011/12/03 22:46:30 jmmv Exp $ +$NetBSD: distinfo,v 1.54 2011/12/11 21:00:41 marino Exp $ SHA1 (emacs-23.3b.tar.gz) = 56503472e99bc7c875ec370dec7b40774cfa82da RMD160 (emacs-23.3b.tar.gz) = d253874ecef5c09d35576cf508727f5863c80834 @@ -10,4 +10,6 @@ SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 +SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9 +SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507 SHA1 (patch-src_unexmacosx.c) = 5821eb65c1e10192a7b2679691e4651b8d9fb263 diff --git a/editors/emacs/files/dragonfly.h b/editors/emacs/files/dragonfly.h index 94650be4dd7..c02b96ad84b 100644 --- a/editors/emacs/files/dragonfly.h +++ b/editors/emacs/files/dragonfly.h @@ -43,13 +43,9 @@ Boston, MA 02111-1307, USA. */ #undef BSD_PGRPS #define GETPGRP_NO_ARG -#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 -#endif +#define ORDINARY_LINK +#define START_FILES +#define LIB_STANDARD -lc #define LD_SWITCH_SYSTEM_1 #define UNEXEC unexelf.o diff --git a/editors/emacs/patches/patch-src_config.in b/editors/emacs/patches/patch-src_config.in new file mode 100644 index 00000000000..edafc09c4ed --- /dev/null +++ b/editors/emacs/patches/patch-src_config.in @@ -0,0 +1,20 @@ +$NetBSD: patch-src_config.in,v 1.1 2011/12/11 21:00:43 marino Exp $ + +--- src/config.in.orig 2011-11-26 03:20:20.000000000 +0000 ++++ src/config.in +@@ -1181,6 +1181,7 @@ extern char *getenv (); + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif ++#if !defined(__DragonFly__) + #ifdef HAVE_ALLOCA_H + # include <alloca.h> + #elif defined __GNUC__ +@@ -1194,6 +1195,7 @@ extern "C" + # endif + void *alloca (size_t); + #endif ++#endif /* __DragonFly__ */ + #ifndef HAVE_SIZE_T + typedef unsigned size_t; + #endif diff --git a/editors/emacs/patches/patch-src_m_amdx86-64.h b/editors/emacs/patches/patch-src_m_amdx86-64.h new file mode 100644 index 00000000000..4d7c0744682 --- /dev/null +++ b/editors/emacs/patches/patch-src_m_amdx86-64.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_m_amdx86-64.h,v 1.1 2011/12/11 21:00:43 marino Exp $ + +--- src/m/amdx86-64.h.orig 2011-11-26 03:20:20.000000000 +0000 ++++ src/m/amdx86-64.h +@@ -101,6 +101,10 @@ along with GNU Emacs. If not, see <http + + /* LIB_STANDARD and START_FILES set correctly in s/netbsd.h */ + ++#elif defined(__DragonFly__) ++ ++/* LIB_STANDARD and START_FILES set correctly in s/dragonfly.h */ ++ + #elif defined(SOLARIS2) + + #undef START_FILES |