commit: c1b0c6d2e86fcba4c9f198d3945c17f5d96dcc92 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Jan 23 14:28:38 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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}
