[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     624edb4460ccd6211cd71bde1f850810c3f3fa1d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 15:05:49 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 15:14:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624edb44

dev-qt/qttools: disable clang test with USE=-clang

Normally harmless (tries to find it, either does or not and will not
use it either way), but if the cmake files are in broken state then
it can abort entirely.

Unsure if it fully resolves bug #916098 (for portage, ideally these
should still be updated "together" as much as possible), but at least
should not trigger on qttools anymore for those not enabling clang
(tested by intentionally breaking llvm's cmake files).

Closes: https://bugs.gentoo.org/916098
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qttools/qttools-6.6.1.ebuild    | 2 ++
 dev-qt/qttools/qttools-6.6.9999.ebuild | 2 ++
 dev-qt/qttools/qttools-6.7.9999.ebuild | 2 ++
 dev-qt/qttools/qttools-6.9999.ebuild   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild b/dev-qt/qttools/qttools-6.6.1.ebuild
index d5c8a41dc777..ef4f14675dbd 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -62,6 +62,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# prevent the clang test as it can abort due to bug #916098
+		$(cmake_use_find_package clang WrapLibClang)
 		$(cmake_use_find_package qml Qt6Qml)
 		$(cmake_use_find_package widgets Qt6Widgets)
 		$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild
index 8966bdc9123b..11611e815135 100644
--- a/dev-qt/qttools/qttools-6.6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.6.9999.ebuild
@@ -62,6 +62,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# prevent the clang test as it can abort due to bug #916098
+		$(cmake_use_find_package clang WrapLibClang)
 		$(cmake_use_find_package qml Qt6Qml)
 		$(cmake_use_find_package widgets Qt6Widgets)
 		$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild
index c171114332af..37d743692e22 100644
--- a/dev-qt/qttools/qttools-6.7.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.7.9999.ebuild
@@ -66,6 +66,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# prevent the clang test as it can abort due to bug #916098
+		$(cmake_use_find_package clang WrapLibClang)
 		$(cmake_use_find_package qml Qt6Qml)
 		$(cmake_use_find_package widgets Qt6Widgets)
 		$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index c171114332af..37d743692e22 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -66,6 +66,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# prevent the clang test as it can abort due to bug #916098
+		$(cmake_use_find_package clang WrapLibClang)
 		$(cmake_use_find_package qml Qt6Qml)
 		$(cmake_use_find_package widgets Qt6Widgets)
 		$(qt_feature assistant)