[meego-commits] 5379: Changes to Trunk:Testing/emacs

[Kangkai Yin]

Hi,
I have made the following changes to emacs in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Kangkai Yin

[This message was auto-generated]

---

Request #5379:

  submit:   home:kai:branches:Trunk:Testing/emacs(r2)(cleanup) -> Trunk:Testing/emacs


Message:
    Add work around for gcc-4.5 built Emacs crash issue, and Drop cpp4.4.2_backslash_newline_option.patch

State:   new          2010-07-06T17:42:50 kai
Comment: None



changes files:
--------------
--- emacs.changes
+++ emacs.changes
@@ -0,0 +1,5 @@
+* Tue Jul  6 2010 Yin Kangkai <kangkai.yin at intel.com> - 23.2
+- Add work around for gcc-4.5 built Emacs crash issue.
+  http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6031
+- Drop cpp4.4.2_backslash_newline_option.patch
+

old:
----
  cpp4.4.2_backslash_newline_option.patch

spec files:
-----------
--- emacs.spec
+++ emacs.spec
@@ -27,7 +27,6 @@
 Patch0: glibc-open-macro.patch
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
-#Patch3: cpp4.4.2_backslash_newline_option.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, dbus-devel, freetype-devel
 BuildRequires: fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel
@@ -136,10 +135,9 @@
 %endif
 
 %build
-# cpp4.4.2_backslash_newline_option.patch
-#patch < %PATCH3
 
-CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" %configure --with-x-toolkit=gtk --with-sound --with-toolkit-scroll-bars
+# add -fno-optimize-sibling-calls to work around gcc-4.5 built Emacs crash issue
+CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fno-optimize-sibling-calls" %configure --with-x-toolkit=gtk --with-sound --with-toolkit-scroll-bars
 
 %{setarch} %__make bootstrap
 %{setarch} %__make %{?_smp_mflags}
@@ -177,7 +175,7 @@
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
 rm src/emacs-%{version}.*
-%configure --without-x
+CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fno-optimize-sibling-calls" %configure --without-x
 %__make %{?_smp_mflags}
 
 # install the emacs without X

other changes:
--------------

++++++ deleted files:
--- cpp4.4.2_backslash_newline_option.patch