* [gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
@ 2023-03-03 10:08 Jimi Huotari
0 siblings, 0 replies; 2+ messages in thread
From: Jimi Huotari @ 2023-03-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: b765522c50168e50a5e07e46d6e0b650c2a11bd0
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 16:29:40 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 10:02:56 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b765522c
dev-qt/qtbase: apply patch for -march compat
Upstream expects people to use specific -march values, but that just causes
problems for Gentoo users. Remove the offending check.
Bug: https://bugs.gentoo.org/898644
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/qt/pull/266
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/files/qtbase-6-march.patch | 46 ++++++++++++++++++++++++++++++++
dev-qt/qtbase/qtbase-6.4.9999.ebuild | 4 +++
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 +++
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 +++
4 files changed, 58 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6-march.patch b/dev-qt/qtbase/files/qtbase-6-march.patch
new file mode 100644
index 00000000..2c5cb0a0
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6-march.patch
@@ -0,0 +1,46 @@
+https://bugreports.qt.io/browse/QTBUG-111698
+https://bugs.gentoo.org/898644
+
+From 5fe96c901cd1ecd3e53acedeb97efd38b6af49a4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 1 Mar 2023 21:31:22 -0500
+Subject: [PATCH] Don't error on partial support for x86-64 v3/v4
+
+Bug: https://bugs.gentoo.org/898644
+---
+ src/corelib/global/qsimd_p.h | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index 1d12902a0a..1449d75d5c 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -227,11 +227,7 @@ asm(
+ // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
+ // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell).
+ # define ARCH_HASWELL_MACROS (__AVX2__ + __BMI2__ + __FMA__ + __LZCNT__)
+-# if ARCH_HASWELL_MACROS != 0
+-# if ARCH_HASWELL_MACROS != 4
+-# error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2"
+-# endif
+-static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing.");
++# if ARCH_HASWELL_MACROS == 4
+ # define __haswell__ 1
+ # endif
+ # undef ARCH_HASWELL_MACROS
+@@ -243,11 +239,7 @@ static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which featur
+ // with AVX512 support and it includes all of these too.
+ //
+ # define ARCH_SKX_MACROS (__AVX512F__ + __AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__)
+-# if ARCH_SKX_MACROS != 0
+-# if ARCH_SKX_MACROS != 5
+-# error "Please enable all x86-64-v4 extensions; you probably want to use -march=skylake-avx512 or -march=x86-64-v4 instead of -mavx512f"
+-# endif
+-static_assert(ARCH_SKX_MACROS, "Undeclared identifiers indicate which features are missing.");
++# if ARCH_SKX_MACROS == 5
+ # define __skylake_avx512__ 1
+ # endif
+ # undef ARCH_SKX_MACROS
+--
+2.39.2
+
diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index 8398b9b5..5e383b62 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -102,6 +102,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/qtbase-6-march.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 289aee78..a8971295 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -102,6 +102,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/qtbase-6-march.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ed5fe710..ce23e756 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -102,6 +102,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/qtbase-6-march.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
@ 2023-03-07 17:49 Jimi Huotari
0 siblings, 0 replies; 2+ messages in thread
From: Jimi Huotari @ 2023-03-07 17:49 UTC (permalink / raw
To: gentoo-commits
commit: c83e0543f5565aef59b04ef30e70a9705dc65a5f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 17:45:40 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 17:48:00 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c83e0543
Revert "dev-qt/qtbase: apply patch for -march compat"
This reverts commit b765522c50168e50a5e07e46d6e0b650c2a11bd0.
Upstream already applied changes regarding the related issue:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8413824ca00188fa36b6adf46d4a5bddb9515ec7
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/files/qtbase-6-march.patch | 46 --------------------------------
dev-qt/qtbase/qtbase-6.4.9999.ebuild | 4 ---
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 ---
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 ---
4 files changed, 58 deletions(-)
diff --git a/dev-qt/qtbase/files/qtbase-6-march.patch b/dev-qt/qtbase/files/qtbase-6-march.patch
deleted file mode 100644
index 2c5cb0a0..00000000
--- a/dev-qt/qtbase/files/qtbase-6-march.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-111698
-https://bugs.gentoo.org/898644
-
-From 5fe96c901cd1ecd3e53acedeb97efd38b6af49a4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 1 Mar 2023 21:31:22 -0500
-Subject: [PATCH] Don't error on partial support for x86-64 v3/v4
-
-Bug: https://bugs.gentoo.org/898644
----
- src/corelib/global/qsimd_p.h | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
-index 1d12902a0a..1449d75d5c 100644
---- a/src/corelib/global/qsimd_p.h
-+++ b/src/corelib/global/qsimd_p.h
-@@ -227,11 +227,7 @@ asm(
- // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
- // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell).
- # define ARCH_HASWELL_MACROS (__AVX2__ + __BMI2__ + __FMA__ + __LZCNT__)
--# if ARCH_HASWELL_MACROS != 0
--# if ARCH_HASWELL_MACROS != 4
--# error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2"
--# endif
--static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing.");
-+# if ARCH_HASWELL_MACROS == 4
- # define __haswell__ 1
- # endif
- # undef ARCH_HASWELL_MACROS
-@@ -243,11 +239,7 @@ static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which featur
- // with AVX512 support and it includes all of these too.
- //
- # define ARCH_SKX_MACROS (__AVX512F__ + __AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__)
--# if ARCH_SKX_MACROS != 0
--# if ARCH_SKX_MACROS != 5
--# error "Please enable all x86-64-v4 extensions; you probably want to use -march=skylake-avx512 or -march=x86-64-v4 instead of -mavx512f"
--# endif
--static_assert(ARCH_SKX_MACROS, "Undeclared identifiers indicate which features are missing.");
-+# if ARCH_SKX_MACROS == 5
- # define __skylake_avx512__ 1
- # endif
- # undef ARCH_SKX_MACROS
---
-2.39.2
-
diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index 5e383b62..8398b9b5 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -102,10 +102,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/qtbase-6-march.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index a8971295..289aee78 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -102,10 +102,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/qtbase-6-march.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ce23e756..ed5fe710 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -102,10 +102,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/qtbase-6-march.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-07 17:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-07 17:49 [gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/ Jimi Huotari
-- strict thread matches above, loose matches on Subject: below --
2023-03-03 10:08 Jimi Huotari
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox