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

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

commit:     43fecd92f7197cbeb286843f239a09fb994cecef
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 01:23:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 17 04:16:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fecd92

dev-qt/qtwebengine: update evex512 workaround for fixed llvm version

The has_version is not *necessary* but will make it easier to
know it's safe to drop when it becomes essentially a no-op.

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

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild    | 3 ++-
 dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 ++-
 dev-qt/qtwebengine/qtwebengine-6.9999.ebuild   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 3646dfddfabf..f4f6d55fdf8c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -243,9 +243,10 @@ src_configure() {
 
 	# Workaround for build failure with clang-18 and -march=native without
 	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
 	use amd64 && tc-is-clang && is-flagq -march=native &&
 		[[ $(clang-major-version) -ge 18 ]] &&
+		has_version '<sys-devel/llvm-18.1.5-r1' &&
 		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
 		append-flags -mevex512
 

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index df7ff429e088..20e7cb3baaa6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -240,9 +240,10 @@ src_configure() {
 
 	# Workaround for build failure with clang-18 and -march=native without
 	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
 	use amd64 && tc-is-clang && is-flagq -march=native &&
 		[[ $(clang-major-version) -ge 18 ]] &&
+		has_version '<sys-devel/llvm-18.1.5-r1' &&
 		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
 		append-flags -mevex512
 

diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index df7ff429e088..20e7cb3baaa6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -240,9 +240,10 @@ src_configure() {
 
 	# Workaround for build failure with clang-18 and -march=native without
 	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
 	use amd64 && tc-is-clang && is-flagq -march=native &&
 		[[ $(clang-major-version) -ge 18 ]] &&
+		has_version '<sys-devel/llvm-18.1.5-r1' &&
 		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
 		append-flags -mevex512