diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-03 01:32:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-03 01:32:36 +0000 |
| commit | 92b7880bd28edc591d46c65b2242bbad6106fb39 (patch) | |
| tree | 0b5c4ff09cb0e02c310fe6c37b2bf391cf932c80 /dev-qt | |
| parent | 7228e7507f59b8f0982c3a68cc5ba8ea35ce1a76 (diff) | |
gentoo auto-resync : 03:03:2023 - 01:32:36
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 11200 -> 11211 bytes | |||
| -rw-r--r-- | dev-qt/qtbase/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6-march.patch | 46 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.4.2.ebuild | 4 |
4 files changed, 52 insertions, 1 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0d7f8d9679a9..6f91abd383b4 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index cc954172436d..4facf18897ed 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,3 +1,4 @@ +AUX qtbase-6-march.patch 1985 BLAKE2B 0ef98173d63ad882489ed37256971a4213807c88d8863f37593e73451d258d23c491ffcb59d068f3843b358cca3cdc803c9813c774df4f9b63fe1e76d6db8d53 SHA512 11137df13f9145fed72a4d157ef7fd9d9db15650c6519695743756c24605f3a32279fba0621165ec78f5b3349a5481e9ba723973f5c03545d3b37bc0c84bc78f DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e -EBUILD qtbase-6.4.2.ebuild 4920 BLAKE2B d041e4bbb6f48eef0d0a8cf486ac83b3425f5728ad881c91e0eab584949781528de21536ff893f4318dc3c99fd3871cd274db37f305da6eefb3002167c6a8bed SHA512 47f3aef9e95d448c30e6eb53c3b916d1b3769bcc02cd6d68603b9e9c1dd954c057f3b94be33467955ac29db838eae75bc614a7fb6b86efb8f465fdb078e20c37 +EBUILD qtbase-6.4.2.ebuild 4969 BLAKE2B f60db5e9adf74a653734311049ac38e1cf057033c5e9113afc2352a000cac177375e9f216fcb037ec3271e15d061d4990c406cbfd12553e5693c3deedef19efb SHA512 1c8de19016f36bb0fd41b32dff570ec13c8efccf48ef207f74b53cafabf167355758b27f70d3e306988f0ef5c233c1ea619ee6862f2d39cc87f7441e7a699a88 MISC metadata.xml 1817 BLAKE2B 8f5b89970837847b5a81326445309f706316943d65ab909c0f0407e95dd5770d9d02a16ad1380a8b1eaee3d251bdc79fba4fee49be688f6db84c1c598de959e0 SHA512 1e650288d6f9e53560163e911ac9f80017e35eaed6b77031f66996e7f7bc3811735e5d9fccd6cddead4c5aaa88ccc032277bb4db45df227ca3a34a643d41c918 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 000000000000..2c5cb0a010cb --- /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.2.ebuild b/dev-qt/qtbase/qtbase-6.4.2.ebuild index 589a3d13aacf..c6545a5f1a0c 100644 --- a/dev-qt/qtbase/qtbase-6.4.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.4.2.ebuild @@ -102,6 +102,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/qtbase-6-march.patch" +) + src_configure() { local mycmakeargs=( -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} |