gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qtbase: remove obsolete cpu feature workaround

Browse Source 
qt6-build.eclass does a different type of workaround,
see the new _qt6-build_sanitize_cpu_flags function.

Bug: https://bugs.gentoo.org/933374
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-06-02 03:15:03 -04:00
parent 3373a27c24
commit 7b48b3f780
4 changed files with 4 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit flag-o-matic qt6-build toolchain-funcs
inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -248,37 +248,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
if use amd64 || use x86; then
# see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
)
# handle odd ones out not matching -m* and macros (keep same order)
local cpuflags=( "${cpufeats[@]}" aes sha )
local cpufeats+=( aesni shani )
local -a intrins
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
)
# do nothing and leave to qtbase if no macros expanded (test failed?)
if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
local -i i
for ((i=0; i<${#cpufeats[@]}; i++)); do
[[ ${intrins[i]} == __* ]] &&
mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
done
mycmakeargs+=( -DTEST_x86intrin=ON )
fi
fi
qt6-build_src_configure
}

33
dev-qt/qtbase/qtbase-6.7.1.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit flag-o-matic qt6-build toolchain-funcs
inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -247,37 +247,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
if use amd64 || use x86; then
# see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
)
# handle odd ones out not matching -m* and macros (keep same order)
local cpuflags=( "${cpufeats[@]}" aes sha )
local cpufeats+=( aesni shani )
local -a intrins
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
)
# do nothing and leave to qtbase if no macros expanded (test failed?)
if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
local -i i
for ((i=0; i<${#cpufeats[@]}; i++)); do
[[ ${intrins[i]} == __* ]] &&
mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
done
mycmakeargs+=( -DTEST_x86intrin=ON )
fi
fi
qt6-build_src_configure
}

33
dev-qt/qtbase/qtbase-6.7.9999.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit flag-o-matic qt6-build toolchain-funcs
inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -245,37 +245,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
if use amd64 || use x86; then
# see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
)
# handle odd ones out not matching -m* and macros (keep same order)
local cpuflags=( "${cpufeats[@]}" aes sha )
local cpufeats+=( aesni shani )
local -a intrins
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
)
# do nothing and leave to qtbase if no macros expanded (test failed?)
if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
local -i i
for ((i=0; i<${#cpufeats[@]}; i++)); do
[[ ${intrins[i]} == __* ]] &&
mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
done
mycmakeargs+=( -DTEST_x86intrin=ON )
fi
fi
qt6-build_src_configure
}

33
dev-qt/qtbase/qtbase-6.9999.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit flag-o-matic qt6-build toolchain-funcs
inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -245,37 +245,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
if use amd64 || use x86; then
# see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
)
# handle odd ones out not matching -m* and macros (keep same order)
local cpuflags=( "${cpufeats[@]}" aes sha )
local cpufeats+=( aesni shani )
local -a intrins
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
)
# do nothing and leave to qtbase if no macros expanded (test failed?)
if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
local -i i
for ((i=0; i<${#cpufeats[@]}; i++)); do
[[ ${intrins[i]} == __* ]] &&
mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
done
mycmakeargs+=( -DTEST_x86intrin=ON )
fi
fi
qt6-build_src_configure
}