commit: 132c1d9248ae30e2f32e37f82fae3d7f711895ce Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Dec 19 19:48:56 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Dec 19 20:31:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132c1d92
qt6-build.eclass: cleanup <6.5.3 and 6.6.0 workarounds Only >=6.6.1 in the tree now and, even if someone wanted to restore 6.5.2, lacking this wouldn't prevent typical usage. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> eclass/qt6-build.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 6f002bc799ad..0e439e946af3 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -66,11 +66,7 @@ readonly QT6_BUILD_TYPE HOMEPAGE="https://www.qt.io/"; LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -if ver_test ${PV} -ge 6.5.3; then - SLOT=6/${PV%%_*} -else - SLOT=6/${PV%.*} # TODO: remove this after <6.5.3 is gone -fi +SLOT=6/${PV%%_*} if [[ ${PN} != qttranslations ]]; then IUSE="test" @@ -257,13 +253,11 @@ _qt6-build_match_cpu_flags() { [[ ${intrin} ]] && flags+=( -mno-${intrin} ) done done < <( - # 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> #endif - avx2=__AVX2__ =__BMI__ =__BMI2__ =__F16C__ ${fma}=__FMA__ =__LZCNT__ =__POPCNT__ + avx2=__AVX2__ =__BMI__ =__BMI2__ =__F16C__ =__FMA__ =__LZCNT__ =__POPCNT__ avx512f=__AVX512F__ avx512bw=__AVX512BW__ avx512cd=__AVX512CD__ avx512dq=__AVX512DQ__ avx512vl=__AVX512VL__ EOF assert
