diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-13 17:28:13 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-13 17:28:13 +0000 |
| commit | 18151575e0122214888d4939ac7666860e9abc56 (patch) | |
| tree | 553f5e88a0486813ffe23437c0d1fa095ff183aa /eclass | |
| parent | remove version 0.6.2 (diff) | |
| download | gentoo-2-18151575e0122214888d4939ac7666860e9abc56.tar.gz gentoo-2-18151575e0122214888d4939ac7666860e9abc56.tar.bz2 gentoo-2-18151575e0122214888d4939ac7666860e9abc56.zip | |
Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4756b56ec763..16d87415c683 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <pesa@gentoo.org> qt4-build-multilib.eclass: + Workaround gcc-4.8 ICE in qtdeclarative (bug 551560). 13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> -gnome-python-common.eclass: diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 94b3794dc6a6..a7264e99e3f5 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -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 @@ qt4-build-multilib_src_prepare() { 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 |