| 1 |
commit: 498a117389dad49f045a17295a80de8a4aa12bb7 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 18:22:08 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 18:36:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498a1173 |
| 7 |
|
| 8 |
dev-util/meson: skip testing when qtcore is installed without qtgui |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/678664 |
| 11 |
Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/meson/meson-0.49.2.ebuild | 7 ++++++- |
| 15 |
dev-util/meson/meson-9999.ebuild | 7 ++++++- |
| 16 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild |
| 19 |
index c7cd92e8d1f..89b176910cb 100644 |
| 20 |
--- a/dev-util/meson/meson-0.49.2.ebuild |
| 21 |
+++ b/dev-util/meson/meson-0.49.2.ebuild |
| 22 |
@@ -42,7 +42,12 @@ python_prepare_all() { |
| 23 |
} |
| 24 |
|
| 25 |
src_test() { |
| 26 |
- distutils-r1_src_test |
| 27 |
+ tc-export PKG_CONFIG |
| 28 |
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then |
| 29 |
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests" |
| 30 |
+ else |
| 31 |
+ distutils-r1_src_test |
| 32 |
+ fi |
| 33 |
} |
| 34 |
|
| 35 |
python_test() { |
| 36 |
|
| 37 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild |
| 38 |
index c7cd92e8d1f..89b176910cb 100644 |
| 39 |
--- a/dev-util/meson/meson-9999.ebuild |
| 40 |
+++ b/dev-util/meson/meson-9999.ebuild |
| 41 |
@@ -42,7 +42,12 @@ python_prepare_all() { |
| 42 |
} |
| 43 |
|
| 44 |
src_test() { |
| 45 |
- distutils-r1_src_test |
| 46 |
+ tc-export PKG_CONFIG |
| 47 |
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then |
| 48 |
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests" |
| 49 |
+ else |
| 50 |
+ distutils-r1_src_test |
| 51 |
+ fi |
| 52 |
} |
| 53 |
|
| 54 |
python_test() { |
Archives