commit:     492099778173832aa98030c2fc423995a0912893
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 14:00:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 14:00:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=49209977

[qt5-build.eclass] Exclude installed_cmake tests as well.

Otherwise qmake generates a make target with unsatisfiable
dependencies because the cmake subdir is excluded.

make: *** No rule to make target 'cmake-make_first',
needed by 'sub-installed_cmake-make_first'.  Stop.

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 31359c5..3607fc7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -225,8 +225,8 @@ qt5-build_src_compile() {
 qt5-build_src_test() {
        echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
-       # '-after SUBDIRS-=cmake' disables broken tests - bug #474004
-       qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
+       # '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
+       qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake 
SUBDIRS-=installed_cmake
        qt5_foreach_target_subdir emake
 
        # create a custom testrunner script that correctly sets

Reply via email to