commit:     7f3dcfe18e8f64b9f69ff8b16a2e5bfe440473a9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 08:54:14 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May  8 16:17:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3dcfe1

dev-qt/qtwebengine: "fix" build with clang-18 + -march=native (qt6)

Needs more looking into but want a quick workaround before 6.7.1
releases with clang users having started to use 18.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

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

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 997dbaf4ec5f..0829dcfa3b22 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -239,6 +239,17 @@ 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
 
        export NINJA NINJAFLAGS=$(get_NINJAOPTS)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -236,6 +236,17 @@ 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
 
        export NINJA NINJAFLAGS=$(get_NINJAOPTS)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -236,6 +236,17 @@ 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
 
        export NINJA NINJAFLAGS=$(get_NINJAOPTS)

Reply via email to