gcc should be fixed, drop workaround (#1091482)

This commit is contained in:
Rex Dieter 2014-05-07 06:22:42 -05:00
parent b67fe78b00
commit b3dff4a11c
1 changed files with 4 additions and 7 deletions

11
qt.spec
View File

@ -25,7 +25,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.6
Release: 6%{?dist}
Release: 7%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -533,12 +533,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# add -fno-devirtualize in attempt to workaround
# https://bugzilla.redhat.com/1091482 , http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60965
%if 0%{?fedora} > 20
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-devirtualize"
%endif
%define platform linux-g++
# some 64bit platforms assume -64 suffix, https://bugzilla.redhat.com/569542
@ -1227,6 +1221,9 @@ fi
%changelog
* Wed May 07 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.6-7
- gcc should be fixed, drop workaround (#1091482)
* Mon May 05 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.6-6
- try -fno-devirtualize workaround fc21+ (#1091482, gcc #60965)