Fix glibc 2.10 issues for Emacs 18. Move Emacs 22 patches to mirrors.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

8 files changed, 25 insertions, 233 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ab41dd91864c..0dd73a2de13e 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.317 2009/05/28 14:07:03 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.318 2009/05/29 16:14:57 ulm Exp $
+
+  29 May 2009; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r6.ebuild,
+  -files/emacs-22.1-Xaw3d-headers.patch, -files/emacs-22.2-sh.patch,
+  emacs-22.3-r2.ebuild, -files/emacs-22.3-freebsd-sparc.patch,
+  -files/emacs-22.3-linux-random-heap.patch:
+  Updated Emacs 18 patchset; this fixes compilation with glibc 2.10 headers.
+  Move Emacs 22 patches to Gentoo mirrors.
 
   28 May 2009; Christian Faulhammer <fauli@gentoo.org> emacs-22.3-r2.ebuild:
   Remove USE=spell from all ebuilds, we don't want such dependencies, see
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ec9ba296bff4..4de180741bbb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,26 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
-AUX emacs-22.2-sh.patch 761 RMD160 4a65a87cfd31d0714e9f99de91dee1c292ba5159 SHA1 1cf46bd5f2bff3e4cff2d6fb43a05dabca81c276 SHA256 743f9e3fcf0059ff68a5ba704311d8aa1ae09600eb3692de51e0b7105ea1f9b4
-AUX emacs-22.3-freebsd-sparc.patch 488 RMD160 37a5499a515a45e19858b6aaa1217ec116811d2d SHA1 47d2880c01857515d38adc9a56485e9bd695cac6 SHA256 963ea3506cbcf4797ec974e2802a11c6e9c09cddf1360dbbe6a452a2cef6efbf
-AUX emacs-22.3-linux-random-heap.patch 566 RMD160 6d0df837e04ba6cd712939092626cc067248cae5 SHA1 0313a5b34bb5b868596408af9b71b18c28b227c4 SHA256 76d049df10d1a4789a45297d8a14b2e7b41e700aefd0aec66ab47fbdfe0c0fbd
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59-patches-3.tar.bz2 17323 RMD160 c0a205792f80c34b599c82fe5cf957f10f80956a SHA1 d452c45756e69edf71a46518cfde809eb65955f9 SHA256 679fe1c0e4fbc2ccf44e6c7097aa093c4e575fde15b5416d944916893bd543ff
+DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b93ed7a9 SHA1 042fddfc02dbd958219382fd42de0f6e20cff6c3 SHA256 495dbcb7bfb4a0dbff57e3d5873adb9eb9a4219dec3136df864ce38a6dc21937
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
+DIST emacs-22.3-patches-1.tar.bz2 2622 RMD160 43d68a7dba5e57676a587ca1bbc97b41c8dae2c1 SHA1 2af958f1d0f7e653db5597abdce307bb70626069 SHA256 4f10bd62440dde10747e262d68a5af779fc787b68ccb1891ddbb4fba2be74ae6
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2516 RMD160 eec73e8fcf1462b945f9414a7db44268961eb7a0 SHA1 050566fc795050ce3609aec693e34217fabd5334 SHA256 92024b0574b11ea073e13cd92c9a652884fed2e817d7d66a5adcc463d1dcd76f
+EBUILD emacs-18.59-r6.ebuild 2517 RMD160 e4b5cfb9d6710a7ff31f9d77bb2738753fab36fc SHA1 0adec98b539e5165fbee402a1924281d83400aa0 SHA256 e57897cbd150b96fedb234f24ca33fadba5bef18ee9059b9a59f456e3768a565
 EBUILD emacs-21.4-r18.ebuild 5288 RMD160 081a0162e5c6e62c771b2697e47fe53677f98d1f SHA1 92faa1924ca6c12be31b3e2a33901cf98b762358 SHA256 f70b9923f1a81c7989c212456c2528e63f42ab324ef319ef71ede1b14bf8f5b7
-EBUILD emacs-22.3-r2.ebuild 7853 RMD160 a816711207322d3269b1ad1c171415ee5949f193 SHA1 49e12b5d807c9bde0ccf058e720babef74275754 SHA256 c130d38c5bdb8feb807f91ae049a324735794d4c61ab6ba051b578d24b39b4fe
-MISC ChangeLog 45366 RMD160 3d32d07e483849bc3f1f45d7a6074d6ddea981de SHA1 651a56bc8e2c37ed745ebc2f7cbb886fe804893d SHA256 b0d60d8a9f659126a180a3943c4474bcbc6f0ce70c3385aa0849f3e01c1c7363
+EBUILD emacs-22.3-r2.ebuild 7624 RMD160 5938d8f514e63a7c2a939025751ba2bc5ea0b59b SHA1 9a0a8bdf8119bbf5a943651ea3ec6d37210b4b1a SHA256 3c899850399efdbab28b3dcfd1128ba645ce4698d605eb3c8c029ba370927448
+MISC ChangeLog 45732 RMD160 ba0093acd7ef85a4b916f66a9053217c754e3999 SHA1 5d1f2af5f2bd7eaf6487e36cb462e741bcf5b9a8 SHA256 70dd61ce135eb89ef86855d34806637b31966035b608c564c50c6c57c3475b39
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkoempAACgkQNQqtfCuFneMm1ACffOAxNZ60vJHQH53xxH9Pc0hQ
-dGgAn1D23AHhGTqHV9GgZIXPtryxtw9H
-=L2c8
+iEYEARECAAYFAkogCmEACgkQOeoy/oIi7uxxjwCghwlGQr2A3zQlSLrRibI7FRoP
+6vIAn2iqlKRKI0eS2nHoVUPDpdB+yCaa
+=3Q3G
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index fe7107df083f..da14b573dbc9 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ b/app-editors/emacs/emacs-18.59-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.2 2009/02/22 16:33:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.3 2009/05/29 16:14:57 ulm Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-3.tar.bz2"
+	mirror://gentoo/${P}-patches-4.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD as-is"
 SLOT="18"
@@ -57,7 +57,7 @@ src_configure() {
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
 	SANDBOX_ON=0
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
+	emake --jobs=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
 }
 
 src_install() {
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index c3ac89be03f3..6e3a6dd273e4 100644
--- a/app-editors/emacs/emacs-22.3-r2.ebuild
+++ b/app-editors/emacs/emacs-22.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.11 2009/05/28 14:07:03 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.12 2009/05/29 16:14:57 ulm Exp $
 
 EAPI=2
 
@@ -8,7 +8,8 @@ inherit autotools elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz
+	mirror://gentoo/${P}-patches-1.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
 SLOT="22"
@@ -53,12 +54,7 @@ FULL_VERSION="${PV}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
-	# SuperH support (bug 238210)
-	epatch "${FILESDIR}/emacs-22.2-sh.patch"
-	# Fix sporadic segmentation faults in unexec (bug 236579)
-	epatch "${FILESDIR}/emacs-22.3-linux-random-heap.patch"
+	EPATCH_SUFFIX=patch epatch
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
deleted file mode 100644
index 8b4f33271395..000000000000
--- a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- emacs-22.1-orig/src/xfns.c	2007-06-02 06:00:11.000000000 +0200
-+++ emacs-22.1/src/xfns.c	2007-07-01 17:19:35.000000000 +0200
-@@ -72,8 +72,13 @@
- #include <X11/Shell.h>
- 
- #ifndef USE_MOTIF
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Label.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_MOTIF */
- 
- #ifdef USG
---- emacs-22.1-orig/src/xmenu.c	2007-05-14 16:56:31.000000000 +0200
-+++ emacs-22.1/src/xmenu.c	2007-07-01 17:19:35.000000000 +0200
-@@ -82,7 +82,11 @@
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
- #ifdef USE_LUCID
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_LUCID */
- #include "../lwlib/lwlib.h"
- #else /* not USE_X_TOOLKIT */
---- emacs-22.1-orig/lwlib/lwlib.c	2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib.c	2007-07-01 17:19:35.000000000 +0200
-@@ -48,7 +48,11 @@
- #endif /* not USE_MOTIF && USE_LUCID */
- #endif
- #if defined (USE_XAW)
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #include "lwlib-Xaw.h"
- #endif
- 
---- emacs-22.1-orig/lwlib/lwlib-Xaw.c	2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib-Xaw.c	2007-07-01 17:19:35.000000000 +0200
-@@ -35,12 +35,21 @@
- #include <X11/CoreP.h>
- #include <X11/Shell.h>
- 
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Scrollbar.h>
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/Command.h>
-+#include <X11/Xaw3d/Label.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Scrollbar.h>
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/Command.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
- 
- #include <X11/Xatom.h>
- 
---- emacs-22.1-orig/configure.in	2007-05-25 14:43:29.000000000 +0200
-+++ emacs-22.1/configure.in	2007-07-01 17:19:35.000000000 +0200
-@@ -2205,29 +2205,45 @@
- 
- dnl Do not put whitespace before the #include statements below.
- dnl Older compilers (eg sunos4 cc) choke on it.
-+HAVE_XAW3D=no
- if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
--  if test x"${HAVE_X11R5}" = xyes; then
--    AC_MSG_CHECKING(X11 version 5 with Xaw)
--    AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
-+  if test x"${HAVE_X11R5}" != xyes; then
-+    USE_X_TOOLKIT=none
-+  else
-+    AC_MSG_CHECKING(for xaw3d)
-+    AC_CACHE_VAL(emacs_cv_xaw3d,
-     [AC_TRY_LINK([
- #include <X11/Intrinsic.h>
--#include <X11/Xaw/Simple.h>],
-+#include <X11/Xaw3d/Simple.h>],
-       [],
--      emacs_cv_x11_version_5_with_xaw=yes,
--      emacs_cv_x11_version_5_with_xaw=no)])
--    if test $emacs_cv_x11_version_5_with_xaw = yes; then
--      AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
-+      emacs_cv_xaw3d=yes,
-+      emacs_cv_xaw3d=no)])
-+    if test $emacs_cv_xaw3d = yes; then
-+      AC_MSG_RESULT([yes; using Lucid toolkit])
-       USE_X_TOOLKIT=LUCID
-+      HAVE_XAW3D=yes
-+      AC_DEFINE(HAVE_XAW3D, 1,
-+                [Define to 1 if you have the Xaw3d library (-lXaw3d).])
-     else
--      if test x"${USE_X_TOOLKIT}" = xLUCID; then
-+      AC_MSG_RESULT(no)
-+      AC_MSG_CHECKING(for libXaw)
-+      AC_CACHE_VAL(emacs_cv_xaw,
-+      [AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <X11/Xaw/Simple.h>],
-+        [],
-+        emacs_cv_xaw=yes,
-+        emacs_cv_xaw=no)])
-+      if test $emacs_cv_xaw = yes; then
-+        AC_MSG_RESULT([yes; using Lucid toolkit])
-+        USE_X_TOOLKIT=LUCID
-+      elif test x"${USE_X_TOOLKIT}" = xLUCID; then
-         AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
-       else
--        AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
-+        AC_MSG_RESULT([no; do not use toolkit by default])
-         USE_X_TOOLKIT=none
-       fi
-     fi
--  else
--    USE_X_TOOLKIT=none
-   fi
- fi
- 
-@@ -2315,21 +2331,6 @@
-   fi
- fi
- 
--### Is -lXaw3d available?
--HAVE_XAW3D=no
--if test "${HAVE_X11}" = "yes"; then
--  if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
--    dnl Fixme: determine what Scrollbar.h needs to avoid compilation
--    dnl errors from the test without the `-'.
--    AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,
--	[AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)], , -)
--    if test "${HAVE_XAW3D}" = "yes"; then
--	AC_DEFINE(HAVE_XAW3D, 1,
--		  [Define to 1 if you have the Xaw3d library (-lXaw3d).])
--    fi
--  fi
--fi
--
- dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
- dnl using Motif or Xaw3d is available, and unless
- dnl --with-toolkit-scroll-bars=no was specified.
diff --git a/app-editors/emacs/files/emacs-22.2-sh.patch b/app-editors/emacs/files/emacs-22.2-sh.patch
deleted file mode 100644
index c4a64697ad8b..000000000000
--- a/app-editors/emacs/files/emacs-22.2-sh.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- emacs-22.2-orig/configure.in	2008-09-26 07:20:44.000000000 +0200
-+++ emacs-22.2/configure.in	2008-09-30 12:57:06.000000000 +0200
-@@ -1192,6 +1192,16 @@
-     machine=mips opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh3el opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sh3eb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds
---- emacs-22.2-orig/src/m/sh3eb.h	1970-01-01 01:00:00.000000000 +0100
-+++ emacs-22.2/src/m/sh3eb.h	2008-09-30 12:59:44.000000000 +0200
-@@ -0,0 +1,4 @@
-+/* machine description file for big-endian SuperH. */
-+
-+#include "sh3el.h"
-+#define WORDS_BIG_ENDIAN
diff --git a/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
deleted file mode 100644
index de206e7e0658..000000000000
--- a/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/159584
-Patch taken from FreeBSD ports, by Giorgos Keramidas <keramida@freebsd.org>
-
---- emacs-orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4573,7 +4573,11 @@
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
- #ifdef __sparc__
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
- 
-   /* Save registers that we need to see on the stack.  We need to see
diff --git a/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch b/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch
deleted file mode 100644
index 37bee82385e0..000000000000
--- a/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/236579
-http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=900
-Fixes sporadic segmentation faults in unexec.
-
---- emacs-22.3-orig/src/emacs.c	2008-05-12 10:30:13.000000000 +0200
-+++ emacs-22.3/src/emacs.c	2008-10-21 16:45:50.000000000 +0200
-@@ -883,7 +883,7 @@
-   if (!initialized
-       && (strcmp (argv[argc-1], "dump") == 0
-           || strcmp (argv[argc-1], "bootstrap") == 0)
--      && heap_bss_diff > MAX_HEAP_BSS_DIFF)
-+      /*&& heap_bss_diff > MAX_HEAP_BSS_DIFF*/)
-     {
-       if (! getenv ("EMACS_HEAP_EXEC"))
-         {