Qt5: disable loader for avx2 optimized plugins

2026-04-22 19:50:05 +02:00 · 2020-10-05 19:53:32 +10:00
parent c0ba16a545
commit ded5f5a26f
2 changed files with 72 additions and 49 deletions
--- a/dev-qt/qt5/patches/qt5-5.15.1.patchset
+++ b/dev-qt/qt5/patches/qt5-5.15.1.patchset
@@ -1,4 +1,4 @@
-From f38755a1cb213c7808c426bba4b78ffca311c33d Mon Sep 17 00:00:00 2001
+From d1ffd868c47c8d20f64a504f4e850f3f5c6a3423 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:51:31 +1000
 Subject: Fix Haiku build
@@ -49,10 +49,10 @@ index ab1da21..5d8617e 100644
     || OS(OPENBSD)          \
     || OS(QNX)              \
 -- 
-2.26.0
+2.28.0


-From 3b4e6f985a16777f3b44b39ac88c0a4511770bf4 Mon Sep 17 00:00:00 2001
+From 74ec545bf871171e23968f1e484a6250d46bdc51 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Mon, 11 Feb 2019 15:53:20 +1000
 Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
@@ -84,10 +84,10 @@ index 105d10a..80932e9 100644
         deviceDir.setNameFilters(deviceFileNameFilterList);
         deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
 -- 
-2.26.0
+2.28.0


-From 8460e088f611ade3c0359996a9290603a88a00d3 Mon Sep 17 00:00:00 2001
+From 5d39eaa4c2578632be296d2cebbc4b830c77ccff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Mon, 11 Feb 2019 15:53:49 +1000
 Subject: Make sure libs are searched in the develop/ dir by CMake
@@ -109,10 +109,10 @@ index 24ed125..52f637e 100644
     CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
     CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
 -- 
-2.26.0
+2.28.0


-From f1d08b2e105efc4b1f8bbca2b0e982c26b9f53e4 Mon Sep 17 00:00:00 2001
+From 3f3429604a1a48e23444cda1861526351da2bc10 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:55:08 +1000
 Subject: Disable built-in haiku QPA plugin
@@ -134,10 +134,10 @@ index 23f838a..8ef1812 100644
 
 qtConfig(integrityfb): SUBDIRS += integrity
 -- 
-2.26.0
+2.28.0


-From e2af0cb5161740492f597a5770f5c1fd28d00028 Mon Sep 17 00:00:00 2001
+From 0221470b1c9027a4717c1cefdee09849e1e1da02 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:55:38 +1000
 Subject: disable mapbox-gl-native on Haiku.
@@ -157,10 +157,10 @@ index b81ad34..7b642c0 100644
         warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
     } else {
 -- 
-2.26.0
+2.28.0


-From 4d396be95955acc290e59f33d0c4c28217a99d1c Mon Sep 17 00:00:00 2001
+From 437c03637773374d1b084752c81860b7e3bbc766 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:56:12 +1000
 Subject: Fix QStandartPaths for Haiku
@@ -220,20 +220,20 @@ index 044d69f..1f255a9 100644
     case GenericConfigLocation:
         paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
 -- 
-2.26.0
+2.28.0


-From bbbcaf6e5924888d42b22917c0faa39be3edada2 Mon Sep 17 00:00:00 2001
+From 682592ede1decdfc17128e7d4e3837d3334fd89a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:56:39 +1000
 Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.


 diff --git a/qtbase/src/network/ssl/qsslsocket.cpp b/qtbase/src/network/ssl/qsslsocket.cpp
-index f411732..2b6043b 100644
+index fbeb9de..02cc653 100644
 --- a/qtbase/src/network/ssl/qsslsocket.cpp
 +++ b/qtbase/src/network/ssl/qsslsocket.cpp
-@@ -2953,6 +2953,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
+@@ -2958,6 +2958,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
                                << "/usr/local/ssl/certs/" // Solaris
                                << "/etc/openssl/certs/" // BlackBerry
                                << "/opt/openssl/certs/" // HP-UX
@@ -242,17 +242,17 @@ index f411732..2b6043b 100644
 }
 
 -- 
-2.26.0
+2.28.0


-From b1897e69749cbe1fd4b47b392a4b312970deb4b6 Mon Sep 17 00:00:00 2001
+From e19569f03ff18d11e985db17df76ae542b4f82d2 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:56:59 +1000
 Subject: Fix build for Haiku platform


 diff --git a/qtbase/mkspecs/features/toolchain.prf b/qtbase/mkspecs/features/toolchain.prf
-index 03612e5..866ad17 100644
+index 9d790f6..55d156c 100644
 --- a/qtbase/mkspecs/features/toolchain.prf
 +++ b/qtbase/mkspecs/features/toolchain.prf
@@ -254,7 +254,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -265,10 +265,10 @@ index 03612e5..866ad17 100644
             # or gold under Linux) will not print any library search path. Need to use another
             # invocation with different options (which in turn doesn't print include search
 -- 
-2.26.0
+2.28.0


-From 94636193a68fab34925d3f48e50b6b31a38281eb Mon Sep 17 00:00:00 2001
+From cbe4a359a377c03c2036f7e9474faa84e58a5a10 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:57:25 +1000
 Subject: Fix build qt3d zip module
@@ -288,10 +288,10 @@ index 2e4e223..6436df5 100644
       #include <utime.h>
     #endif
 -- 
-2.26.0
+2.28.0


-From a7b2f53d56e5aedb5a815d9fd834cd2bee378bfa Mon Sep 17 00:00:00 2001
+From f54915880945d5dcd7e79a85adb4d483c3f2c5e9 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:57:54 +1000
 Subject: Fix endian detection
@@ -315,17 +315,17 @@ index 9bb306e..9f0ea58 100644
 #    endif
 #  endif
 -- 
-2.26.0
+2.28.0


-From df5fb3342ab4226512e8628f9468a91560d54f28 Mon Sep 17 00:00:00 2001
+From 4c650b583fea535c61bf2f71f44f6ef7582032b8 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 27 Apr 2019 17:47:23 +1000
 Subject: Add dnslookup query function for Haiku


 diff --git a/qtbase/src/network/kernel/kernel.pri b/qtbase/src/network/kernel/kernel.pri
-index 110d9f5..9c80595 100644
+index 7282e20..d2faef3 100644
 --- a/qtbase/src/network/kernel/kernel.pri
 +++ b/qtbase/src/network/kernel/kernel.pri
@@ -54,6 +54,11 @@ android:qtConfig(dnslookup) {
@@ -403,17 +403,17 @@ index 0000000..0b387df
 +
 +QT_END_NAMESPACE
 -- 
-2.26.0
+2.28.0


-From ab809e037c7086dbe5e36e9c9c75a15aa4aed8b8 Mon Sep 17 00:00:00 2001
+From b378401733f24ec8666c2d88c6985d47341f88f5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 27 May 2020 19:54:30 +1000
 Subject: Disable LibResolv for Haiku


 diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
-index 625fbab..8e1dce7 100644
+index 9b0a2ee..480671b 100644
 --- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
 +++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
@@ -87,7 +87,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
@@ -426,10 +426,10 @@ index 625fbab..8e1dce7 100644
 struct LibResolv
 {
 -- 
-2.26.0
+2.28.0


-From a7454336904e36c3a750063ff93a94eddbff919d Mon Sep 17 00:00:00 2001
+From 3c308f71240c494fe3f3131614d1ec71b8ba1d13 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 8 Sep 2019 00:17:19 +1000
 Subject: Don't use ifaddrs for Haiku
@@ -449,20 +449,20 @@ index 4c57bff..0c8e38f 100644
 #endif
 
 -- 
-2.26.0
+2.28.0


-From f87d010714539a5437231b5fa4735713f1d89d29 Mon Sep 17 00:00:00 2001
+From 09d34cea1ca67bb36367710d0d2dcabeb30a4f10 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 8 Sep 2019 18:32:05 +1000
 Subject: Add platform plugins installer


 diff --git a/qtbase/src/gui/gui.pro b/qtbase/src/gui/gui.pro
-index 6e92283..c528ed3 100644
+index 20372d9..803e9b7 100644
 --- a/qtbase/src/gui/gui.pro
 +++ b/qtbase/src/gui/gui.pro
-@@ -34,6 +34,7 @@ testcocoon {
+@@ -35,6 +35,7 @@ testcocoon {
 
 osx: LIBS_PRIVATE += -framework AppKit
 darwin: LIBS_PRIVATE += -framework CoreGraphics
@@ -471,7 +471,7 @@ index 6e92283..c528ed3 100644
 CONFIG += simd optimize_full
 
 diff --git a/qtbase/src/gui/kernel/qguiapplication.cpp b/qtbase/src/gui/kernel/qguiapplication.cpp
-index 13369dc..cd9c393 100644
+index 239a783..8bdb7f6 100644
 --- a/qtbase/src/gui/kernel/qguiapplication.cpp
 +++ b/qtbase/src/gui/kernel/qguiapplication.cpp
@@ -116,6 +116,11 @@
@@ -515,10 +515,10 @@ index 13369dc..cd9c393 100644
         // Windows: Display message box unless it is a console application
         // or debug build showing an assert box.
 -- 
-2.26.0
+2.28.0


-From 0fab7538b3004cf69673b245bc6c817b243d4516 Mon Sep 17 00:00:00 2001
+From d50302a60710100ceed487bdbb0d9af9540e5ed7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 15 Dec 2019 11:27:19 +1000
 Subject: Enable assembler for JIT
@@ -538,10 +538,10 @@ index ead1e75..58d9635 100644
 class PlatformAssembler_X86_64_SysV : public JSC::MacroAssembler<JSC::MacroAssemblerX86_64>
 {
 -- 
-2.26.0
+2.28.0


-From dbcaaf1fd39649df2cfb4b1f43cc5fe7ca57fde2 Mon Sep 17 00:00:00 2001
+From 61e1c632163e47eb6fe825084ba459b55010c687 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 27 May 2020 19:54:58 +1000
 Subject: Disable sharedmemory feature for bootstrap
@@ -562,20 +562,20 @@ index c212ccb..1a31b62 100644
 
 DEFINES += \
 -- 
-2.26.0
+2.28.0


-From 5d0e765a448dc5c16b5ec4ab879f370238615834 Mon Sep 17 00:00:00 2001
+From 05f9feef7a57b1dd03b62c0e9190fecd63603a49 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 29 Dec 2019 18:13:19 +1000
 Subject: Fix build for x86_gcc2


 diff --git a/qtbase/src/3rdparty/forkfd/forkfd.c b/qtbase/src/3rdparty/forkfd/forkfd.c
-index 50784de..d5a2f6e 100644
+index b663b8a..5ad2b12 100644
 --- a/qtbase/src/3rdparty/forkfd/forkfd.c
 +++ b/qtbase/src/3rdparty/forkfd/forkfd.c
-@@ -725,7 +725,7 @@ int forkfd(int flags, pid_t *ppid)
+@@ -719,7 +719,7 @@ int forkfd(int flags, pid_t *ppid)
         /* parent process */
         info->deathPipe = death_pipe[1];
         fd = death_pipe[0];
@@ -585,10 +585,10 @@ index 50784de..d5a2f6e 100644
         /* release the child */
 #ifdef HAVE_EVENTFD
 -- 
-2.26.0
+2.28.0


-From 3778e64b217d5d8f0b3a270a0b7ef3907ecee25e Mon Sep 17 00:00:00 2001
+From d9fb34037c2500d55ee24212110360127d9e8994 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Thu, 4 Jun 2020 23:11:17 +1000
 Subject: Implement QFilesystemWatcher for Haiku
@@ -981,10 +981,10 @@ index 0000000..8a8d75a
 +#endif // QFILESYSTEMWATCHER_HAIKU_P_H
 +
 -- 
-2.26.0
+2.28.0


-From a2c015a07be61f1fff74a8ed584b6075d3ce548e Mon Sep 17 00:00:00 2001
+From 99c3380949601083a8b194b9d6bb70d2d68a8fdd Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 16 Jun 2020 18:06:57 +1000
 Subject: Don't use AF_INET6 for new sockets
@@ -1008,5 +1008,28 @@ index e5b9fbb..a1b1fc4 100644
 
     int socket = qt_safe_socket(domain, type, protocol, O_NONBLOCK);
 -- 
-2.26.0
+2.28.0
+
+
+From cd28dcebb36aedacc5f826acd30c6ba6c5f24286 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 5 Oct 2020 19:40:40 +1000
+Subject: Disable Haswell CPU feature for plugins
+
+
+diff --git a/qtbase/src/corelib/plugin/qlibrary_unix.cpp b/qtbase/src/corelib/plugin/qlibrary_unix.cpp
+index a5c72f8..cc2afac 100644
+--- a/qtbase/src/corelib/plugin/qlibrary_unix.cpp
+++ b/qtbase/src/corelib/plugin/qlibrary_unix.cpp
+@@ -191,7 +191,7 @@ bool QLibraryPrivate::load_sys()
+         prefixes.append(QString());
+     }
+ 
+-#if defined(Q_PROCESSOR_X86) && !defined(Q_OS_DARWIN)
+#if defined(Q_PROCESSOR_X86) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HAIKU)
+     if (qCpuHasFeature(ArchHaswell)) {
+         auto transform = [](QStringList &list, void (*f)(QString *)) {
+             QStringList tmp;
+-- 
+2.28.0

--- a/dev-qt/qt5/qt5-5.15.1.recipe
+++ b/dev-qt/qt5/qt5-5.15.1.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3
 	FDL"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="44da876057e21e1be42de31facd99be7d5f9f07893e1ea762359bcee0ef64ee9"
 SOURCE_DIR="qt-everywhere-src-$portVersion"