aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2024-06-11 12:19:59 -0700
committerorbea <orbea@riseup.net>2024-06-11 12:20:17 -0700
commitea9c98a953b41a0b6682279e396cb4ca5ad526a2 (patch)
treee0d57155f106fbd4d152ae39b2c571734fa83db1
parentdev-lang/python: drop 3.11.8_p1, 3.12.2_p1 (diff)
downloadlibressl-ea9c98a953b41a0b6682279e396cb4ca5ad526a2.tar.gz
libressl-ea9c98a953b41a0b6682279e396cb4ca5ad526a2.tar.bz2
libressl-ea9c98a953b41a0b6682279e396cb4ca5ad526a2.zip
dev-qt/qtbase: sync ::gentoo
Signed-off-by: orbea <orbea@riseup.net>
-rw-r--r--dev-qt/qtbase/qtbase-6.7.1.ebuild35
1 files changed, 2 insertions, 33 deletions
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index 904144a..263fbfc 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -3,12 +3,12 @@
EAPI=8
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
declare -A QT6_IUSE=(
@@ -249,37 +249,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
}