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 6E68F15817D for ; Tue, 11 Jun 2024 19:21:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5E51E2BAD; Tue, 11 Jun 2024 19:21:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 83BB1E2BAD for ; Tue, 11 Jun 2024 19:21:37 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FDDC335D0F for ; Tue, 11 Jun 2024 19:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B244A15F7 for ; Tue, 11 Jun 2024 19:21:34 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1718133617.ea9c98a953b41a0b6682279e396cb4ca5ad526a2.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtbase/qtbase-6.7.1.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: ea9c98a953b41a0b6682279e396cb4ca5ad526a2 X-VCS-Branch: master Date: Tue, 11 Jun 2024 19:21:34 +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: 4d787063-aef5-4b60-a049-a1b8464dc7b2 X-Archives-Hash: 07bf78b5ebb66d859f17cf1b40e1593f commit: ea9c98a953b41a0b6682279e396cb4ca5ad526a2 Author: orbea riseup net> AuthorDate: Tue Jun 11 19:19:59 2024 +0000 Commit: orbea riseup net> CommitDate: Tue Jun 11 19:20:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ea9c98a9 dev-qt/qtbase: sync ::gentoo Signed-off-by: orbea riseup.net> dev-qt/qtbase/qtbase-6.7.1.ebuild | 35 ++--------------------------------- 1 file 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 }