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/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.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/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..d622ee53 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From b93340f0e24d97015a62649616cc52c92473ac64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | ||
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | ||
5 | for musl | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | chromium/base/allocator/allocator_shim.cc | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | ||
13 | index 4b7de5e1a3..fe565223f2 100644 | ||
14 | --- a/chromium/base/allocator/allocator_shim.cc | ||
15 | +++ b/chromium/base/allocator/allocator_shim.cc | ||
16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { | ||
17 | // In the case of tcmalloc we also want to plumb into the glibc hooks | ||
18 | // to avoid that allocations made in glibc itself (e.g., strdup()) get | ||
19 | // accidentally performed on the glibc heap instead of the tcmalloc one. | ||
20 | -#if defined(USE_TCMALLOC) | ||
21 | +#if defined(USE_TCMALLOC) && defined(__GLIBC__) | ||
22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" | ||
23 | #endif | ||
24 | |||