summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-11-26 16:07:49 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-11-27 07:38:23 +0200
commit3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch)
tree368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
parent08cc9ad2579f897b84d4fb430d898103dc568d26 (diff)
parent929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff)
downloadmeta-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/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
new file mode 100644
index 00000000..ec54908b
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -0,0 +1,24 @@
1From 02c6554c372709fd8573d66e4f128ffe0d74f237 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
5 for musl
6
7Signed-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
12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
13index 1233ae2a8aa..6f1b3e87224 100644
14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, 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