rpms/emacs/devel emacs.spec,1.172,1.173
Karel Klíč
kklic at fedoraproject.org
Thu Jul 8 16:29:49 UTC 2010
Author: kklic
Update of /cvs/extras/rpms/emacs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28078
Modified Files:
emacs.spec
Log Message:
A workaround for GCC 4.5.0 bug as noted in etc/PROBLEMS
Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- emacs.spec 8 Jul 2010 15:00:51 -0000 1.172
+++ emacs.spec 8 Jul 2010 16:29:49 -0000 1.173
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.2
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -185,7 +185,11 @@ autoconf
# Build GTK+2 binary
mkdir build-gtk && cd build-gtk
ln -s ../configure .
-%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+
+# Emacs crashes when running in a terminal, if compiled with GCC 4.5.0
+# Work around this error in gcc-4.5 by omitting sibling call optimization.
+# CFLAGS should be removed when GCC is updated to 4.5.1 or higher.
+CFLAGS="$CFLAGS -fno-optimize-sibling-calls" %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
--with-tiff --with-xft --with-xpm --with-x-toolkit=gtk
make bootstrap
%{setarch} make %{?_smp_mflags}
@@ -194,7 +198,10 @@ cd ..
# Build binary without X support
mkdir build-nox && cd build-nox
ln -s ../configure .
-%configure --with-x=no
+# Emacs crashes when running in a terminal, if compiled with GCC 4.5.0
+# Work around this error in gcc-4.5 by omitting sibling call optimization.
+# CFLAGS should be removed when GCC is updated to 4.5.1 or higher.
+CFLAGS="$CFLAGS -fno-optimize-sibling-calls" %configure --with-x=no
%{setarch} make %{?_smp_mflags}
cd ..
@@ -405,6 +412,9 @@ alternatives --install %{_bindir}/etags
%dir %{_datadir}/emacs/%{version}
%changelog
+* Thu Jul 8 2010 Karel Klic <kklic at redhat.com> - 1:23.2-7
+- Added workaround for an GCC 4.5.0 bug
+
* Thu Jul 8 2010 Karel Klic <kklic at redhat.com> - 1:23.2-6
- Removed Obsoletes: emacs-nxml-mode, it was obsoleted in F-11
- Added COPYING to emacs-el, moved COPYING in emacs-common to %doc
More information about the scm-commits
mailing list