gentoo auto-resync : 10:05:2024 - 00:01:13

4 files changed, 24 insertions, 36 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0325a2c844d3..da406a1a3023 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,7 +9,7 @@ DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a5
 DIST qtwebengine-6.7-patchset-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa
 DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
 EBUILD qtwebengine-5.15.13_p20240322.ebuild 7347 BLAKE2B b449a017794860e13345e2459841d1ffcd9d3d5f7eef91e9c546724e4622c59762943ac6e7f1e2b3fdd707adc9bad75476e25d93f81c549db4b7e3d8111fd43f SHA512 73e3d01e18bc17ad8cd210cc161a5aae9d7fd0dac6416ff59ed976252d7eedad25d2d2b44597f62a7fd9a105880ba4b00853753e131ae4c09aeb6e06cbb59cdd
-EBUILD qtwebengine-6.7.0.ebuild 10511 BLAKE2B 1f4c2bf5030ac7353ae3810030629f46cd43e11be8a7d1d8c72abb19199f1704e46cf71841dc493cc78831b8cea0d386b93863c41eb50a66f50dd0fd2dd63a01 SHA512 2b330f693b678321552c5f018926becac6c63d46d9eca97640f2e0c32d73095a15e1a3db7ed84f01cf96a4be38caa3b96baba549e8ff1d6123528e0eaf172155
-EBUILD qtwebengine-6.7.9999.ebuild 10378 BLAKE2B 6e26f4dcccdf7752c15f83b2cb80619bbdfd361197e8c03e6cdd9777267e92290f1571b27145e299f30e6af1d4862b7da48f33dadddc4fbc2dcc6e8d74dce075 SHA512 b5b6f7a4c00d2fd6461e08297f5cf10a33af6ad534c8823a52d1baa224fd2da860142d270fcf83ad2cdcd08829dbce2a90a60c621932651ba417372d1fb9758a
-EBUILD qtwebengine-6.9999.ebuild 10378 BLAKE2B 6e26f4dcccdf7752c15f83b2cb80619bbdfd361197e8c03e6cdd9777267e92290f1571b27145e299f30e6af1d4862b7da48f33dadddc4fbc2dcc6e8d74dce075 SHA512 b5b6f7a4c00d2fd6461e08297f5cf10a33af6ad534c8823a52d1baa224fd2da860142d270fcf83ad2cdcd08829dbce2a90a60c621932651ba417372d1fb9758a
+EBUILD qtwebengine-6.7.0.ebuild 10191 BLAKE2B aebf0453100339cd32815106d2ae286b770b4f11d3f3035ad76184ce5c45705c58d5b35a3757e83a1918c8e3ce8306cd387acfa9f8de7fcdd99df75074ba5f4c SHA512 36e11fccec1f98ebd8b1037052e9545ae0834b7236496c2f9c7cbb1644b134df874d5584c411b9ce5eef043cc9ff14e78dd5edaa47fe277cfbe87c9d5fb2bfcc
+EBUILD qtwebengine-6.7.9999.ebuild 10058 BLAKE2B 213e14b063a890f58937af7b8c0280e25b899218ab979a1ec549b0b4ee9ed5df50165f648ca478bec8ae654c0b26666a21669080e9ae18795ccc613505365a44 SHA512 cf750e9c9d9f86419a6711a4300848a5f6c9be51aaa421902afcbf89cf02be24f93a2f1dbe7ab16ca6e96592410a5bd74482111a6706d798599c54617db34e0b
+EBUILD qtwebengine-6.9999.ebuild 10058 BLAKE2B 213e14b063a890f58937af7b8c0280e25b899218ab979a1ec549b0b4ee9ed5df50165f648ca478bec8ae654c0b26666a21669080e9ae18795ccc613505365a44 SHA512 cf750e9c9d9f86419a6711a4300848a5f6c9be51aaa421902afcbf89cf02be24f93a2f1dbe7ab16ca6e96592410a5bd74482111a6706d798599c54617db34e0b
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 0829dcfa3b22..cccffedf5380 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -239,19 +239,15 @@ src_configure() {
 		# for simplicity. Override with USE=custom-cflags if wanted, please
 		# report if above -march works again so can cleanup.
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
-		# skia and xnnpack fail with clang-18 + some(?) -march=native while
-		# can't reproduce with seemingly equivalent =skylake), needs more
-		# looking into as there may be something odd going on (clang bug?).
-		# Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
-		# we are not supposed to pass -march=native in the first place.
-		# TODO: try dropping this on major Qt and clang bumps
-		# See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
-		# (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
-		use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
-			filter-flags -march=native
 	fi
 
+	# Workaround for build failure with clang-18 and -march=native without
+	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+	use amd64 && tc-is-clang && is-flagq -march=native &&
+		[[ $(clang-major-version) -ge 18 ]] &&
+		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+		append-flags -mevex512
+
 	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 750f700160b2..bba17446d874 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -236,19 +236,15 @@ src_configure() {
 		# for simplicity. Override with USE=custom-cflags if wanted, please
 		# report if above -march works again so can cleanup.
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
-		# skia and xnnpack fail with clang-18 + some(?) -march=native while
-		# can't reproduce with seemingly equivalent =skylake), needs more
-		# looking into as there may be something odd going on (clang bug?).
-		# Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
-		# we are not supposed to pass -march=native in the first place.
-		# TODO: try dropping this on major Qt and clang bumps
-		# See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
-		# (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
-		use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
-			filter-flags -march=native
 	fi
 
+	# Workaround for build failure with clang-18 and -march=native without
+	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+	use amd64 && tc-is-clang && is-flagq -march=native &&
+		[[ $(clang-major-version) -ge 18 ]] &&
+		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+		append-flags -mevex512
+
 	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 750f700160b2..bba17446d874 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -236,19 +236,15 @@ src_configure() {
 		# for simplicity. Override with USE=custom-cflags if wanted, please
 		# report if above -march works again so can cleanup.
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
-		# skia and xnnpack fail with clang-18 + some(?) -march=native while
-		# can't reproduce with seemingly equivalent =skylake), needs more
-		# looking into as there may be something odd going on (clang bug?).
-		# Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
-		# we are not supposed to pass -march=native in the first place.
-		# TODO: try dropping this on major Qt and clang bumps
-		# See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
-		# (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
-		use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
-			filter-flags -march=native
 	fi
 
+	# Workaround for build failure with clang-18 and -march=native without
+	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+	use amd64 && tc-is-clang && is-flagq -march=native &&
+		[[ $(clang-major-version) -ge 18 ]] &&
+		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+		append-flags -mevex512
+
 	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"