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 BEBBF15838C for ; Tue, 23 Jan 2024 14:37:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97774E2A6D; Tue, 23 Jan 2024 14:36:59 +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 762C8E2A6D for ; Tue, 23 Jan 2024 14:36:59 +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 6365934332A for ; Tue, 23 Jan 2024 14:36:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C46AB13AA for ; Tue, 23 Jan 2024 14:36:56 +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: <1706020422.c1b0c6d2e86fcba4c9f198d3945c17f5d96dcc92.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.6.1-r3.ebuild dev-qt/qtbase/qtbase-6.6.9999.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: c1b0c6d2e86fcba4c9f198d3945c17f5d96dcc92 X-VCS-Branch: master Date: Tue, 23 Jan 2024 14:36:56 +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: 81a658f1-39a8-4757-8621-7f859429a1c8 X-Archives-Hash: ce07a7a99c835c9ade7a7fa5617554fc commit: c1b0c6d2e86fcba4c9f198d3945c17f5d96dcc92 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jan 23 14:28:38 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jan 23 14:33:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b0c6d2 Revert "dev-qt/qtbase: add IUSE=cpu_flags_x86_rdrand" Regardless of if that worked or not, on second thought this was a bad idea. The flag is rather misleading for generic binhosts because they should actually *enable* it to allow optional usage (runtime detection). And then, this is actually broken on top, so let's just return to the previous state. This reverts commit c198f69e66547b5ba7d2ba1b9bae576ce93ee703. Bug: https://bugs.gentoo.org/922498 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 11 +---------- dev-qt/qtbase/qtbase-6.6.9999.ebuild | 11 +---------- dev-qt/qtbase/qtbase-6.7.9999.ebuild | 11 +---------- dev-qt/qtbase/qtbase-6.9999.ebuild | 11 +---------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild index d9f21bee7611..a0defb2de975 100644 --- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild @@ -25,8 +25,6 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [cpuflags]="cpu_flags_x86_rdrand" - [optfeature]="nls wayland" #810802,864509 ) IUSE="${QT6_IUSE[*]}" @@ -237,14 +235,7 @@ src_configure() { ) if use amd64 || use x86; then - # see bug #922498, let detection do its thing if set - use cpu_flags_x86_rdrand || - mycmakeargs+=( - -DQT_FEATURE_rdrnd=OFF - -DQT_FEATURE_rdseed=OFF - ) - - # see bug #913400 for explanations, mostly to handle -mno-* + # 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} diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild index 1df2ecec87b6..dcaf37200a90 100644 --- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild @@ -24,8 +24,6 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [cpuflags]="cpu_flags_x86_rdrand" - [optfeature]="nls wayland" #810802,864509 ) IUSE="${QT6_IUSE[*]}" @@ -234,14 +232,7 @@ src_configure() { ) if use amd64 || use x86; then - # see bug #922498, let detection do its thing if set - use cpu_flags_x86_rdrand || - mycmakeargs+=( - -DQT_FEATURE_rdrnd=OFF - -DQT_FEATURE_rdseed=OFF - ) - - # see bug #913400 for explanations, mostly to handle -mno-* + # 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} diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index 558e1b6b1caf..10afd1ff2ad0 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -24,8 +24,6 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [cpuflags]="cpu_flags_x86_rdrand" - [optfeature]="nls" #810802 ) IUSE="${QT6_IUSE[*]}" @@ -237,14 +235,7 @@ src_configure() { ) if use amd64 || use x86; then - # see bug #922498, let detection do its thing if set - use cpu_flags_x86_rdrand || - mycmakeargs+=( - -DQT_FEATURE_rdrnd=OFF - -DQT_FEATURE_rdseed=OFF - ) - - # see bug #913400 for explanations, mostly to handle -mno-* + # 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} diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 558e1b6b1caf..10afd1ff2ad0 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -24,8 +24,6 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [cpuflags]="cpu_flags_x86_rdrand" - [optfeature]="nls" #810802 ) IUSE="${QT6_IUSE[*]}" @@ -237,14 +235,7 @@ src_configure() { ) if use amd64 || use x86; then - # see bug #922498, let detection do its thing if set - use cpu_flags_x86_rdrand || - mycmakeargs+=( - -DQT_FEATURE_rdrnd=OFF - -DQT_FEATURE_rdseed=OFF - ) - - # see bug #913400 for explanations, mostly to handle -mno-* + # 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}