summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.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/0012-chromium-musl-linux-glibc-make-the-distinction.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/0012-chromium-musl-linux-glibc-make-the-distinction.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch
new file mode 100644
index 00000000..e2c738ae
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -0,0 +1,23 @@
1From 4ba6b9ae21289cbaa04b531082e1089c06c845bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 chromium/base/allocator/allocator_check.cc | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12index 5fb86467dde..9864858eb67 100644
13--- a/chromium/base/allocator/allocator_check.cc
14+++ b/chromium/base/allocator/allocator_check.cc
15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
16 // Set by allocator_shim_override_ucrt_symbols_win.h when the
17 // shimmed _set_new_mode() is called.
18 return g_is_win_shim_layer_initialized;
19-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
20+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
21 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
22 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
23 // TODO(primiano): replace with an include once base can depend on allocator.