From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA731138334 for ; Sat, 2 Mar 2019 23:09:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B045CE084E; Sat, 2 Mar 2019 23:09:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85737E084E for ; Sat, 2 Mar 2019 23:09:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE9D8335D12 for ; Sat, 2 Mar 2019 23:09:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B94F517 for ; Sat, 2 Mar 2019 23:09:18 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1551567976.444110f1ded243ffe62e98f2fbc23b2423443708.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/meson-0.49.2.ebuild X-VCS-Directories: dev-util/meson/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 444110f1ded243ffe62e98f2fbc23b2423443708 X-VCS-Branch: master Date: Sat, 2 Mar 2019 23:09:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4f1cda58-5466-472c-b840-5287547abf44 X-Archives-Hash: 1233780034faf49be049bf4b77a5e02a commit: 444110f1ded243ffe62e98f2fbc23b2423443708 Author: William Hubbs gentoo org> AuthorDate: Sat Mar 2 23:04:02 2019 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Mar 2 23:06:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444110f1 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 gentoo.org> dev-util/meson/meson-0.49.2.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild index 6149ebc1ee5..31d9ff7f79e 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 }