summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:19:24 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:20:17 +0200
commitf29e5bf1d15372a21e3e79a23afbc2be9fbaa004 (patch)
treeb2256fc1ebc713c8d51897eb46116b35d28551e9 /recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
parent07393133a7c0c27c71a24da5ec09834281fd0f13 (diff)
parentf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (diff)
downloadmeta-qt5-f29e5bf1d15372a21e3e79a23afbc2be9fbaa004.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14 1b8e5570 qtbase: Use pcre packages by default fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples 1a7c8fa4 qtlocation: use geoclue 2 ddbf8dd0 qtbase: use offscreen platform plugin for tools 4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk 56b2c13d qtbase-native: disable vulkan support 6b34fd17 maliit-framework-qt5: fix test installations aa50163c qtenginio: remove obsolete module 32edd746 ogl-runtime: update to v2.5.0 release f7dcc706 qtquick3d: add recipe b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance 1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance ca649e3f qt5: Update to Qt 5.14.0 ede15adc qtbase: Fix patch fuzz detected with devtool e8221c2c qtbase: Backport the patch from upstream gerrit ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo 6e7cc682 qtwebengine: Move CharAllocator definition to header 33a86256 qt5-creator: Add missing dep on libz.so 3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions d8f0db7f qtwebengine: Include cstddef for size_t definition b6bd407e qmllive: Fix build with multilib settings 69e1fd33 quazip: Fix multilib builds a4db065b qtwebkit: Fix linking errors on clang/mips/ppc f756a065 ogl-runtime: Only compile for supported architectures 710d995b qttools: Add option to disable qdoc a02e01ca qttools: Use CONFIG+=disable_external_rpath 0d88f448 packagegroup-qt5-toolchain-target: Make machine specific 2a2055fa recipes: Disable clang dependent recipes for riscv64/32 Conflicts: recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
new file mode 100644
index 00000000..631ae8a0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
@@ -0,0 +1,31 @@
1From 725941687b118b90904fbc7e6b25a288b9d3c52b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: musl: pread pwrite
5
6Redefine pread/pwrite in terms of 64bit variants on musl
7since 32bit variants don't exist and aliases are not defined in
8libc either
9
10Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/]
11Signed-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
16diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
17index 622cc1fbf7e..cd561b80c05 100644
18--- a/chromium/third_party/lss/linux_syscall_support.h
19+++ b/chromium/third_party/lss/linux_syscall_support.h
20@@ -1239,6 +1239,11 @@ struct kernel_statfs {
21 #ifndef __NR_fallocate
22 #define __NR_fallocate 285
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