From: William Hubbs Date: Sat, 2 Mar 2019 23:04:02 +0000 (-0600) Subject: dev-util/meson: fix qt tests X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=444110f1ded243ffe62e98f2fbc23b2423443708;p=gentoo.git dev-util/meson: fix qt tests Upstream only supports the qt tests if both qtcore and qtgui are installed, so if only qtcore is installed, skip the tests. Closes: https://bugs.gentoo.org/678664 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: William Hubbs --- diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild index 6149ebc1ee51..31d9ff7f79ec 100644 --- a/dev-util/meson/meson-0.49.2.ebuild +++ b/dev-util/meson/meson-0.49.2.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 }