diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch | |
parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
download | meta-qt5-5.13.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
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/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
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.patch | 31 |
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 @@ | |||
1 | From debbdd4f419ef2d48c3e1fb0128dc4ac6c9f687b 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 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 | ||