diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-27 09:21:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-05 14:56:55 +0200 |
commit | a73de388e628a67490cdd7734779d405740b7fa3 (patch) | |
tree | c6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch | |
parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
download | meta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz |
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based.
- PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations
has been removed from src/buildtools/configure.json
- DEPENDS nodejs-native added. This mandatory for chromium build.
Task-number: QTBUG-90623
Change-Id: Ic933c88399422941114915afe5baa202850928f4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch new file mode 100644 index 00000000..554afdfe --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 5ce942260f64c70234a0af73af9cc8d26e99f188 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 | ||
4 | Subject: [PATCH] chromium: musl: pread pwrite | ||
5 | |||
6 | Redefine pread/pwrite in terms of 64bit variants on musl | ||
7 | since 32bit variants don't exist and aliases are not defined in | ||
8 | libc either | ||
9 | |||
10 | Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | chromium/third_party/lss/linux_syscall_support.h | 5 +++++ | ||
14 | 1 file changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
17 | index e4ac22644c0..37988077a23 100644 | ||
18 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
19 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
20 | @@ -1258,6 +1258,11 @@ struct kernel_statfs { | ||
21 | #ifndef __NR_getrandom | ||
22 | #define __NR_getrandom 318 | ||
23 | #endif | ||
24 | +#undef __NR_pread | ||
25 | +#define __NR_pread __NR_pread64 | ||
26 | +#undef __NR_pwrite | ||
27 | +#define __NR_pwrite __NR_pwrite64 | ||
28 | + | ||
29 | /* End of x86-64 definitions */ | ||
30 | #elif defined(__mips__) | ||
31 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | ||