From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E87841584F2 for ; Thu, 13 Mar 2025 11:54:53 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D483F3434B1 for ; Thu, 13 Mar 2025 11:54:53 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CFC0711037F; Thu, 13 Mar 2025 11:54:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C2AEF11037F for ; Thu, 13 Mar 2025 11:54:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72FE63434B0 for ; Thu, 13 Mar 2025 11:54:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D06711909 for ; Thu, 13 Mar 2025 11:54:50 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1741866862.bccf210c4456ce4eae2e8edfd55e592fa9901d4f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qttools/qttools-6.9.9999.ebuild dev-qt/qttools/qttools-6.9999.ebuild X-VCS-Directories: dev-qt/qttools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: bccf210c4456ce4eae2e8edfd55e592fa9901d4f X-VCS-Branch: master Date: Thu, 13 Mar 2025 11:54:50 +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: 3a57cde0-21ba-4e68-ac7f-4b39322eb55b X-Archives-Hash: 8009442e7eba17a873ec21475d0412ff commit: bccf210c4456ce4eae2e8edfd55e592fa9901d4f Author: Ionen Wolkens gentoo org> AuthorDate: Thu Mar 13 11:36:00 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Mar 13 11:54:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccf210c dev-qt/qttools: fix clang selection for >=6.9 Qt added new logic for clang selection where it iterates through a list of supported version and always picks the most recent one from that list ignoring the eclass. May be a better way, but for now just remove the version check. Does not seem to have been backported to 6.8, so leaving that one alone. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.9.9999.ebuild | 7 +++++++ dev-qt/qttools/qttools-6.9999.ebuild | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild index ebf1142f7f02..74e7e707f774 100644 --- a/dev-qt/qttools/qttools-6.9.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9.9999.ebuild @@ -62,6 +62,13 @@ DEPEND=" ) " +src_prepare() { + qt6-build_src_prepare + + # qttools is picky about clang versions and ignores LLVM_SLOT + sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || die +} + src_configure() { use clang && llvm_chost_setup diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index ebf1142f7f02..74e7e707f774 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -62,6 +62,13 @@ DEPEND=" ) " +src_prepare() { + qt6-build_src_prepare + + # qttools is picky about clang versions and ignores LLVM_SLOT + sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || die +} + src_configure() { use clang && llvm_chost_setup