diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
| commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
| tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch | |
| parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
| parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
| download | meta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz | |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
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 | ||