pesa 15/05/31 13:56:53 Modified: ChangeLog qt4-build-multilib.eclass Log: Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
Revision Changes Path 1.1633 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1632&r2=1.1633 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1632 retrieving revision 1.1633 diff -u -r1.1632 -r1.1633 --- ChangeLog 31 May 2015 10:11:35 -0000 1.1632 +++ ChangeLog 31 May 2015 13:56:53 -0000 1.1633 @@ -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.1632 2015/05/31 10:11:35 perfinion Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1633 2015/05/31 13:56:53 pesa Exp $ + + 31 May 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: + Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780). 31 May 2015; Jason Zaman <[email protected]> kde4-base.eclass, kde5.eclass: KDE: fix SELinux deps, bug 550824 1.16 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.15&r2=1.16 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- qt4-build-multilib.eclass 10 May 2015 14:27:29 -0000 1.15 +++ qt4-build-multilib.eclass 31 May 2015 13:56:53 -0000 1.16 @@ -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.15 2015/05/10 14:27:29 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16 2015/05/31 13:56:53 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -154,20 +154,6 @@ || die "sed failed (skip X11 tests)" fi - if use_if_iuse aqua; then - sed -i \ - -e '/^CONFIG/s:app_bundle::' \ - -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ - mkspecs/$(qt4_get_mkspec)/qmake.conf \ - || die "sed failed (aqua)" - - # we are crazy and build cocoa + qt3support - if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then - sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ - configure || die "sed failed (cocoa + qt3support)" - fi - fi - if [[ ${PN} == qtcore ]]; then # Bug 373061 # qmake bus errors with -O2 or -O3 but -O1 works @@ -182,6 +168,11 @@ fi fi + if [[ ${PN} == qtwebkit ]]; then + # Bug 550780 + filter-flags -fgraphite-identity -floop-strip-mine + fi + # Bug 261632 if use ppc64; then append-flags -mminimal-toc @@ -220,6 +211,20 @@ mkspecs/$(qt4_get_mkspec)/qmake.conf \ || die "sed QMAKE_(LIB|INC)DIR failed" + if use_if_iuse aqua; then + sed -i \ + -e '/^CONFIG/s:app_bundle::' \ + -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ + mkspecs/$(qt4_get_mkspec)/qmake.conf \ + || die "sed failed (aqua)" + + # we are crazy and build cocoa + qt3support + if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then + sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ + configure || die "sed failed (cocoa + qt3support)" + fi + fi + if [[ ${CHOST} == *-darwin* ]]; then # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) sed -i \
