diff options
Diffstat (limited to 'editors/emacs/patches/patch-xx')
| -rw-r--r-- | editors/emacs/patches/patch-xx | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/editors/emacs/patches/patch-xx b/editors/emacs/patches/patch-xx index 08a1034743a..4e1b8aab5ac 100644 --- a/editors/emacs/patches/patch-xx +++ b/editors/emacs/patches/patch-xx @@ -1,30 +1,21 @@ -$NetBSD: patch-xx,v 1.6 2005/03/22 15:39:05 wiz Exp $ +$NetBSD: patch-xx,v 1.7 2007/06/11 13:57:21 markd Exp $ ---- src/s/netbsd.h.orig 2002-05-31 18:29:02.000000000 +0200 +Following breaks gtk option as prefers /usr/X11R6 libs to those in /usr/pkg, +and is not needed as these get set in enough other places - at least for +pkgsrc. + +--- src/s/netbsd.h.orig 2007-06-11 08:57:06.000000000 +1200 +++ src/s/netbsd.h -@@ -60,9 +60,17 @@ - #endif /* not NO_SHARED_LIBS and not ELF */ - - #if !defined (NO_SHARED_LIBS) && defined (__ELF__) -+#if defined(HAVE_NETBSD_CRTI) -+#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crti.o /usr/lib/crtbegin.o -+#else - #define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o -+#endif - #define UNEXEC unexelf.o -+#if defined(HAVE_NETBSD_CRTN) -+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o -+#else - #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o -+#endif - #undef LIB_GCC - #define LIB_GCC - #endif -@@ -123,3 +131,7 @@ - - #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS +@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */ + #define AMPERSAND_FULL_NAME -+/* Use sigprocmask(2) and friends instead of sigblock(2); the man page -+ of sigblock says it is obsolete. */ -+ -+#define POSIX_SIGNALS 1 + #ifdef __ELF__ +-/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option +- says where to find X windows at run time. We convert it to a -rpath option +- which is what OSF1 uses. */ +-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'` +-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib +- + /* The following is needed to make `configure' find Xpm, Xaw3d and + image include and library files if using /usr/bin/gcc. That + compiler seems to be modified to not find headers in |