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