pesa        15/06/13 17:28:13

  Modified:             ChangeLog qt4-build-multilib.eclass
  Log:
  Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).

Revision  Changes    Path
1.1659               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1658&r2=1.1659

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- ChangeLog   13 Jun 2015 17:24:25 -0000      1.1658
+++ ChangeLog   13 Jun 2015 17:28:13 -0000      1.1659
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1658 2015/06/13 
17:24:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1659 2015/06/13 
17:28:13 pesa Exp $
+
+  13 Jun 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass:
+  Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
 
   13 Jun 2015; Alexandre Rostovtsev <[email protected]>
   -gnome-python-common.eclass:



1.23                 eclass/qt4-build-multilib.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.22&r2=1.23

Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-build-multilib.eclass   13 Jun 2015 16:10:09 -0000      1.22
+++ qt4-build-multilib.eclass   13 Jun 2015 17:28:13 -0000      1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22 
2015/06/13 16:10:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23 
2015/06/13 17:28:13 pesa Exp $
 
 # @ECLASS: qt4-build-multilib.eclass
 # @MAINTAINER:
@@ -171,9 +171,20 @@
                fi
        fi
 
+       if [[ ${PN} == qtdeclarative ]]; then
+               # Bug 551560
+               # gcc-4.8 ICE with -Os, fixed in 4.9
+               if use x86 && [[ $(gcc-version) == 4.8 ]]; then
+                       replace-flags -Os -O2
+               fi
+       fi
+
        if [[ ${PN} == qtwebkit ]]; then
                # Bug 550780
-               filter-flags -fgraphite-identity -floop-strip-mine
+               # various ICEs with graphite-related flags, gcc-5 works
+               if [[ $(gcc-major-version) -lt 5 ]]; then
+                       filter-flags -fgraphite-identity -floop-strip-mine
+               fi
        fi
 
        # Bug 261632




Reply via email to