summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-13 00:41:52 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-07-14 23:56:51 +0200
commitd69be5de8c15bfe015c8a6ffb15eee3afb43b841 (patch)
tree225ef848492aa1aa1817d7702215ff413076abb1 /recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
parent92c634e9d584ebbf508b5ca4fea6d61d38373513 (diff)
downloadmeta-qt5-d69be5de8c15bfe015c8a6ffb15eee3afb43b841.tar.gz
qtwebengine: Fix build on musl
import needed chromium patches from meta-browser Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch b/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
new file mode 100644
index 00000000..b999c599
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
@@ -0,0 +1,26 @@
1From 482e77e9562b8a158b5b212e9f1c83c697fed2e2 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 07/12] allocator: Do not include glibc_weak_symbols for musl
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 base/allocator/allocator_shim.cc | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc
12index 57a398aaa..54c79063a 100644
13--- a/base/allocator/allocator_shim.cc
14+++ b/base/allocator/allocator_shim.cc
15@@ -263,7 +263,7 @@ void ShimFree(void* address) {
16 // In the case of tcmalloc we also want to plumb into the glibc hooks
17 // to avoid that allocations made in glibc itself (e.g., strdup()) get
18 // accidentally performed on the glibc heap instead of the tcmalloc one.
19-#if defined(USE_TCMALLOC)
20+#if defined(USE_TCMALLOC) && defined(__GLIBC__)
21 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
22 #endif
23
24--
252.13.2
26