diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-03-07 13:44:09 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-03-10 09:27:33 +0100 |
commit | 74c27fa59b329f1210d39e8cd2904acf30d10838 (patch) | |
tree | 7db3edd064427d207e72c1ade90fae579e97684b /recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch | |
parent | 32e6203c8c31ace8eb31e2e8c6de72d5de8cc531 (diff) |
qt5: upgrade to v5.15.3-lts-lgpl
* https://github.com/meta-qt5/meta-qt5/issues/455
* https://lists.qt-project.org/pipermail/development/2022-March/042262.html
qtbase/0021-qfloat16-Include-limits-header.patch partially resolved in upstream commit:
0afad46bb7 Fix build with GCC 11: include <limits>
qtbase/0022-fix_timezone_dst.patch resolved in upstream commits:
692c7e021f Fix QTzTimeZonePrivate::displayName()'s fallback
5f91ed1493 QTzTimeZonePrivate::init(): fix handling of empty ID
9f74724d84 Fix handling of Sunday in POSIX time-zone rules
qtsvg/CVE-2021-3481.patch: partially resolved in upstream commit:
aceea78 Improve handling of malformed numeric values in svg files
but the 2nd part is still needed.
qtcoap, qtknx, qtmqtt, qtopcua: keep QT_MODULE_BRANCH "5.15.2" as
it still wasn't downmerged to 5.15 branch and there is no
v5.15.3-lts-lgpl tag in these as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch b/recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch new file mode 100644 index 00000000..8198b4f5 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Define-__NR_futex-if-it-does-not-exist.patch @@ -0,0 +1,33 @@ +From 308746ac207de4f1c3429d6e61ff071809378b70 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 26 Oct 2020 22:10:02 -0700 +Subject: [PATCH] Define __NR_futex if it does not exist + +__NR_futex is not defines by newer architectures e.g. arc, riscv32 as +they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on +__NR_futex, since this is used in applications, such applications start +to fail to build for these newer architectures. This patch defines a +fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps +working + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/corelib/thread/qfutex_p.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h +index f287b752d7..fa5307a604 100644 +--- a/src/corelib/thread/qfutex_p.h ++++ b/src/corelib/thread/qfutex_p.h +@@ -76,6 +76,9 @@ QT_END_NAMESPACE + # include <unistd.h> + # include <asm/unistd.h> + # include <linux/futex.h> ++# if !defined(__NR_futex) && defined(__NR_futex_time64) ++# define __NR_futex __NR_futex_time64 ++# endif + # define QT_ALWAYS_USE_FUTEX + + // if not defined in linux/futex.h |