| 1 |
commit: 01f3512592d5830c0d1442a4df3043cec905fc02 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 2 23:11:39 2019 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 23:11:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f35125 |
| 7 |
|
| 8 |
dev-util/meson: sync live |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/meson/meson-9999.ebuild | 11 +++++------ |
| 14 |
1 file changed, 5 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild |
| 17 |
index 6149ebc1ee5..31d9ff7f79e 100644 |
| 18 |
--- a/dev-util/meson/meson-9999.ebuild |
| 19 |
+++ b/dev-util/meson/meson-9999.ebuild |
| 20 |
@@ -42,12 +42,11 @@ python_prepare_all() { |
| 21 |
} |
| 22 |
|
| 23 |
src_test() { |
| 24 |
- if tc-is-gcc; then |
| 25 |
- # LTO fails for static libs because the bfd plugin in missing. |
| 26 |
- # Remove this workaround after sys-devel/gcc-config-2.0 is stable. |
| 27 |
- # https://bugs.gentoo.org/672706 |
| 28 |
- tc-getPROG AR gcc-ar >/dev/null |
| 29 |
- fi |
| 30 |
+ # This is needed because upstream doesn't support installing qtcore |
| 31 |
+ # without qtgui in the test suite. |
| 32 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=678664 |
| 33 |
+ has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' && |
| 34 |
+ rm -rf "test cases/frameworks/4 qt" |
| 35 |
distutils-r1_src_test |
| 36 |
} |
Archives