[gentoo-commits] proj/qt:master commit in: eclass/

[Michael Palimaka]

commit:     c4c66ad230789d5d1ec1bf0b8c735095d4b76dfa
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 19:53:48 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 19:53:48 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c4c66ad2

[eclass] Disable cmake-related tests wrt bug #474004.

---
 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d089b87..16b5d93 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -261,7 +261,8 @@ qt5-build_src_test() {
        EOF
        chmod +x "${testrunner}"
 
-       qt5_foreach_target_subdir qt5_qmake
+       # '-after SUBDIRS-=cmake' disables broken tests - bug #474004
+       qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
        qt5_foreach_target_subdir emake
 
        _test_runner() {
@@ -579,7 +580,7 @@ qt5_base_configure() {
 qt5_qmake() {
        local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
 
-       "${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \
+       "${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" "$@" \
                || die "qmake failed (${projectdir})"
 }