summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-01-27 13:30:03 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2021-01-27 13:30:03 +0100
commit7520e38d187cba6685848e12b3203f805c8f31a3 (patch)
treefb069516be7b663283d76009ca7ce5daa4f27771 /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
parentb6f9fee5a31f62e36562ffb4055a525a5920b1c0 (diff)
downloadmeta-qt5-7520e38d187cba6685848e12b3203f805c8f31a3.tar.gz
qtwebengine: refresh the patches
* update to match https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.9 https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15.meta-qt5.9 https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based-glibc 83-based-glibc.meta-qt5.1 https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based 83-based.meta-qt5.1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-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/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
new file mode 100644
index 00000000..96eac41d
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -0,0 +1,24 @@
1From a07b5244ac103dd49c3deab81b6bed7589f5384e 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 ef42d5ad67f..626e4c996a5 100644
14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -352,7 +352,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 BUILDFLAG(USE_TCMALLOC)
21+#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
22 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
23 #endif
24