OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Mar-2004 20:43:09
Branch: HEAD Handle: 2004030219430800
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
Emacs segfaulted when starting up in X mode if built with "with_x11 yes"
on Solaris 9 with a recent version GNU ld. This is because a couple of
years ago, GNU ld changed the "combreloc" switch from being defaulted
off to being defaulted on. So now we need "-z nocombreloc" to build
emacs with GNU ld. Emacs had been patched to turn on this option for
GNU/Linux and FreeBSD, but not for Solaris.
Submitted by: Dennis McRitchie <[EMAIL PROTECTED]>
Summary:
Revision Changes Path
1.4 +11 -0 openpkg-src/emacs/emacs.patch
1.44 +1 -1 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 emacs.patch
--- openpkg-src/emacs/emacs.patch 31 Jul 2003 07:41:13 -0000 1.3
+++ openpkg-src/emacs/emacs.patch 2 Mar 2004 19:43:08 -0000 1.4
@@ -122,3 +122,14 @@
#endif
#define SYSV_SYSTEM_DIR
+--- src/s/sol2-4.h.orig 1998-08-28 19:38:20.000000000 -0400
++++ src/s/sol2-4.h 2004-02-27 16:21:42.615474000 -0500
+@@ -24,7 +24,7 @@
+ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
+ has anything in it. It can be empty.
+ This works ok in temacs. */
+-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
++#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc -L/usr/ccs/lib \
+ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
+ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
+ #endif /* GCC */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 emacs.spec
--- openpkg-src/emacs/emacs.spec 7 Feb 2004 17:54:42 -0000 1.43
+++ openpkg-src/emacs/emacs.spec 2 Mar 2004 19:43:08 -0000 1.44
@@ -34,7 +34,7 @@
Group: Editor
License: GPL
Version: 21.3
-Release: 20040207
+Release: 20040302
# package options
%option with_x11 no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
