summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-16 23:53:10 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-17 20:42:43 +0200
commit246ec7b7d9078400d0509468b560a272e8b40e0f (patch)
tree6fb6c9b5534787363236cee075b609f5a27a8909 /recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
parentd82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 (diff)
downloadmeta-qt5-246ec7b7d9078400d0509468b560a272e8b40e0f.tar.gz
qtwebengine: refresh patches
* upload the patches to b5.8 branch on: https://github.com/meta-qt5/qtwebengine and 53-based on: https://github.com/meta-qt5/qtwebengine-chromium * refresh the patches 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, 0 insertions, 26 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
deleted file mode 100644
index b999c599..00000000
--- a/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
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