diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
tree | 377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch | |
parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
download | meta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch new file mode 100644 index 00000000..3d322708 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From feabe4c75c5e86dbe2c624da9423f2ad82c6bfac Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 | ||
4 | Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | .../tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
12 | index 91f77dd88d..bb84a0b305 100644 | ||
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
15 | @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; | ||
16 | #if defined(__x86_64__) | ||
17 | /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ | ||
18 | LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, | ||
19 | - __off64_t o) { | ||
20 | + off64_t o) { | ||
21 | LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), | ||
22 | LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), | ||
23 | LSS_SYSCALL_ARG(d), (uint64_t)(o)); | ||