diff options
| author |   orbea <orbea@riseup.net> | 2024-02-24 18:05:21 -0800 |
|---|---|---|
| committer | orbea <orbea@riseup.net> | 2024-02-24 18:05:21 -0800 |
| commit | 8520a12ca5a255ea1f0b0523a585f2d4396a51b3 (patch) | |
| tree | b7c3419aeb76d3b61a3f902e4b0ffeadda8cb8f0 /dev-qt | |
| parent | net-vpn/tor: stabilize 0.4.8.10 for amd64, ppc, x86 (diff) | |
| download | libressl-8520a12ca5a255ea1f0b0523a585f2d4396a51b3.tar.gz libressl-8520a12ca5a255ea1f0b0523a585f2d4396a51b3.tar.bz2 libressl-8520a12ca5a255ea1f0b0523a585f2d4396a51b3.zip | |
dev-qt/qtbase: sync ::gentoo
Signed-off-by: orbea <orbea@riseup.net>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch | 13 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.6.2.ebuild | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch new file mode 100644 index 0000000..1204dcc --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/925103 +--- a/src/corelib/thread/qthread.h ++++ b/src/corelib/thread/qthread.h +@@ -166,5 +166,9 @@ + #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) + // x86_64 Linux, BSD uses FS ++# if defined(__ILP32__) ++ __asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); ++# else + __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); ++# endif + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN) + // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.6.2.ebuild index aafc726..9348366 100644 --- a/dev-qt/qtbase/qtbase-6.6.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.2.ebuild @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch ) src_prepare() { |