summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-22 10:26:45 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-25 09:19:26 +0200
commit929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch)
tree2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
parentfd86202d56c542011d24dc518457631bc00901c9 (diff)
parent12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff)
downloadmeta-qt5-929b2ef266c6eb4cc1f5500f421fda449cd8900b.tar.gz
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13: 12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
new file mode 100644
index 00000000..a12e28c4
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
@@ -0,0 +1,31 @@
1From debbdd4f419ef2d48c3e1fb0128dc4ac6c9f687b 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 e19e51dd304..5c661949d1e 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