commit:     5dbe5492e36a97ee169ed1490d8281691f9cc7dd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 16:32:28 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 16:34:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dbe5492

qt6-build.eclass: extend avx2/fma mismatch workaround to 6.6.0

6.6.0 is lacking qsimd_p.h changes that 6.5.3 had, will be in 6.6.1.

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

 eclass/qt6-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 35a710b86545..6f002bc799ad 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -257,8 +257,8 @@ _qt6-build_match_cpu_flags() {
                                [[ ${intrin} ]] && flags+=( -mno-${intrin} )
                        done
        done < <(
-               # TODO: drop ver_test and ${fma} when <6.5.3 is gone
-               ver_test ${PV} -ge 6.5.3 && fma= || fma=fma
+               # TODO: drop ver_test and ${fma} when <6.5.3 and 6.6.0 are gone
+               ver_test ${PV} -ge 6.5.3 && ver_test ${PV} -ne 6.6.0 && fma= || 
fma=fma
                $(tc-getCXX) -E -P ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 2
                        #if defined(__GNUC__) && (defined(__x86_64__) || 
defined(__i386__))
                        #include <x86intrin.h>

Reply via email to