pesa 15/08/07 02:05:19 Modified: ChangeLog qt5-build.eclass Log: Fix bugs #549140 and #552942.
Revision Changes Path 1.1749 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1748&r2=1.1749 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1748 retrieving revision 1.1749 diff -u -r1.1748 -r1.1749 --- ChangeLog 7 Aug 2015 01:07:09 -0000 1.1748 +++ ChangeLog 7 Aug 2015 02:05:19 -0000 1.1749 @@ -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.1748 2015/08/07 01:07:09 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1749 2015/08/07 02:05:19 pesa Exp $ + + 07 Aug 2015; Davide Pesavento <[email protected]> qt5-build.eclass: + Fix bugs #549140 and #552942. 07 Aug 2015; Davide Pesavento <[email protected]> qt5-build.eclass: Allow passing arguments to qmake from ebuilds via the myqmakeargs array. 1.23 eclass/qt5-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.22&r2=1.23 Index: qt5-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- qt5-build.eclass 7 Aug 2015 01:07:09 -0000 1.22 +++ qt5-build.eclass 7 Aug 2015 02:05:19 -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/qt5-build.eclass,v 1.22 2015/08/07 01:07:09 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.23 2015/08/07 02:05:19 pesa Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -195,6 +195,14 @@ find config.tests/unix -name '*.test' -type f \ -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \ || die "sed failed (config.tests)" + + # Don't add -O3 to CXXFLAGS (bug 549140) + sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ + src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" + + # Don't force sse2 on x86 (bug 552942) + sed -i -e 's/^sse2:/false:&/' \ + mkspecs/features/qt_module.prf || die "sed failed (sse2)" fi # apply patches
