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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 87EFE1581EE for ; Thu, 03 Apr 2025 09:10:06 +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 6B40D343267 for ; Thu, 03 Apr 2025 09:10:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5D43811042D; Thu, 03 Apr 2025 09:10:05 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5296911042D for ; Thu, 03 Apr 2025 09:10:05 +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 EEC0D343226 for ; Thu, 03 Apr 2025 09:10:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BC141936 for ; Thu, 03 Apr 2025 09:10:03 +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: <1743671383.b1344b7bfd4f1f362c20a98d8c3193eb451aeef3.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.8.3.ebuild dev-qt/qttools/qttools-6.9.0.ebuild 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: b1344b7bfd4f1f362c20a98d8c3193eb451aeef3 X-VCS-Branch: master Date: Thu, 03 Apr 2025 09:10:03 +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: 42c67cf1-14db-42e5-b8ea-80e837c8cad3 X-Archives-Hash: 5539d4c1df4706ac613303cf3347cf48 commit: b1344b7bfd4f1f362c20a98d8c3193eb451aeef3 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Apr 3 08:55:21 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Apr 3 09:09:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1344b7b dev-qt/qttools: fix clang detection with libcxx Happened to notice this while testing 6.9.0 with llvm-musl, and this been broken since 6.8.3 (with USE=clang) that had the same change picked to. CMake Error at cmake/FindWrapLibClang.cmake:72 (find_package): find_package called with invalid argument "20.1.1+libcxx" At first I thought this was caused by our sed, but that specific line is unmodified and is using ${LLVM_VERSION} which has the +libcxx bit appended (or at least, it does with llvm:20). This is Qt's attempt at getting a "matching" version for Clang. Given we are trying to remove version specifications to let the eclass pick them instead (will always match), may as well just remove it as well. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.8.3.ebuild | 3 ++- dev-qt/qttools/qttools-6.9.0.ebuild | 3 ++- dev-qt/qttools/qttools-6.9.9999.ebuild | 3 ++- dev-qt/qttools/qttools-6.9999.ebuild | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-qt/qttools/qttools-6.8.3.ebuild b/dev-qt/qttools/qttools-6.8.3.ebuild index 52750e2eb0d8..b8a40f8285e6 100644 --- a/dev-qt/qttools/qttools-6.8.3.ebuild +++ b/dev-qt/qttools/qttools-6.8.3.ebuild @@ -66,7 +66,8 @@ 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 + sed -e '/find_package/s/${\(LLVM_\)*VERSION}//' \ + -i cmake/FindWrapLibClang.cmake || die } src_configure() { diff --git a/dev-qt/qttools/qttools-6.9.0.ebuild b/dev-qt/qttools/qttools-6.9.0.ebuild index 52750e2eb0d8..b8a40f8285e6 100644 --- a/dev-qt/qttools/qttools-6.9.0.ebuild +++ b/dev-qt/qttools/qttools-6.9.0.ebuild @@ -66,7 +66,8 @@ 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 + sed -e '/find_package/s/${\(LLVM_\)*VERSION}//' \ + -i cmake/FindWrapLibClang.cmake || die } src_configure() { diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild index 52750e2eb0d8..b8a40f8285e6 100644 --- a/dev-qt/qttools/qttools-6.9.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9.9999.ebuild @@ -66,7 +66,8 @@ 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 + sed -e '/find_package/s/${\(LLVM_\)*VERSION}//' \ + -i cmake/FindWrapLibClang.cmake || die } src_configure() { diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 52750e2eb0d8..b8a40f8285e6 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -66,7 +66,8 @@ 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 + sed -e '/find_package/s/${\(LLVM_\)*VERSION}//' \ + -i cmake/FindWrapLibClang.cmake || die } src_configure() {