| 1 |
commit: c4c66ad230789d5d1ec1bf0b8c735095d4b76dfa |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 27 19:53:48 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 27 19:53:48 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c4c66ad2 |
| 7 |
|
| 8 |
[eclass] Disable cmake-related tests wrt bug #474004. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt5-build.eclass | 5 +++-- |
| 12 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 15 |
index d089b87..16b5d93 100644 |
| 16 |
--- a/eclass/qt5-build.eclass |
| 17 |
+++ b/eclass/qt5-build.eclass |
| 18 |
@@ -261,7 +261,8 @@ qt5-build_src_test() { |
| 19 |
EOF |
| 20 |
chmod +x "${testrunner}" |
| 21 |
|
| 22 |
- qt5_foreach_target_subdir qt5_qmake |
| 23 |
+ # '-after SUBDIRS-=cmake' disables broken tests - bug #474004 |
| 24 |
+ qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake |
| 25 |
qt5_foreach_target_subdir emake |
| 26 |
|
| 27 |
_test_runner() { |
| 28 |
@@ -579,7 +580,7 @@ qt5_base_configure() { |
| 29 |
qt5_qmake() { |
| 30 |
local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} |
| 31 |
|
| 32 |
- "${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \ |
| 33 |
+ "${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" "$@" \ |
| 34 |
|| die "qmake failed (${projectdir})" |
| 35 |
} |
Archives