From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E858515849D for ; Sun, 2 Jun 2024 08:22:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 338FDE2AE4; Sun, 2 Jun 2024 08:22:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13538E2AE4 for ; Sun, 2 Jun 2024 08:22:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7BB833D9AD for ; Sun, 2 Jun 2024 08:22:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8097C1B43 for ; Sun, 2 Jun 2024 08:22:27 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1717316527.7b48b3f78072691a3e4170abfd150bdeea065f93.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/qtbase-6.7.0-r2.ebuild dev-qt/qtbase/qtbase-6.7.1.ebuild dev-qt/qtbase/qtbase-6.7.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 7b48b3f78072691a3e4170abfd150bdeea065f93 X-VCS-Branch: master Date: Sun, 2 Jun 2024 08:22:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ac06f4d-9a60-4768-9cf4-db2fe2b32262 X-Archives-Hash: 02d1ed48f526b0c6770e4bd4a6d40a00 commit: 7b48b3f78072691a3e4170abfd150bdeea065f93 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Jun 2 07:15:03 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Jun 2 08:22:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b48b3f7 dev-qt/qtbase: remove obsolete cpu feature workaround 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 gentoo.org> dev-qt/qtbase/qtbase-6.7.0-r2.ebuild | 33 +-------------------------------- dev-qt/qtbase/qtbase-6.7.1.ebuild | 33 +-------------------------------- dev-qt/qtbase/qtbase-6.7.9999.ebuild | 33 +-------------------------------- dev-qt/qtbase/qtbase-6.9999.ebuild | 33 +-------------------------------- 4 files changed, 4 insertions(+), 128 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild index 203bcb3c6d6f..b3b3f80bb86a 100644 --- a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild @@ -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 } diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild index 40845fc00e5b..8fcaa6b8b960 100644 --- a/dev-qt/qtbase/qtbase-6.7.1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild @@ -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 } diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index 016279f8fec5..fbe1ce6c1da1 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -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 } diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 016279f8fec5..fbe1ce6c1da1 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -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 }