aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:41:36 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:52:34 +0200
commitfaa5163a269b429c1d6bfd4387ced0aaff4eba69 (patch)
tree715edf950cf9da83e31548935e06f1be157c4788 /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
parentafcde8567252191820ed07abcc241f3794b75988 (diff)
qtwebengine: refresh the patches
* update to match https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based-glibc 80-based-glibc.meta-qt5.4 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 80-based.meta-qt5.4 * 0002-icu-use-system-library-only-targets.patch is only for chromium, so it was updated and moved to right place in SRC_URI * 0014-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch prefix was moved to src/3rdparty not src/3rdparty/chromium so that it can apply with "git am" together with other chromium patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-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/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
new file mode 100644
index 00000000..37276844
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -0,0 +1,24 @@
+From 68decc5d87b4eb013f1455fc4f81f67f926fa3b2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 15:09:02 -0700
+Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
+ for musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ chromium/base/allocator/allocator_shim.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
+index ef42d5ad67f..626e4c996a5 100644
+--- a/chromium/base/allocator/allocator_shim.cc
++++ b/chromium/base/allocator/allocator_shim.cc
+@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
+ // In the case of tcmalloc we also want to plumb into the glibc hooks
+ // to avoid that allocations made in glibc itself (e.g., strdup()) get
+ // accidentally performed on the glibc heap instead of the tcmalloc one.
+-#if BUILDFLAG(USE_TCMALLOC)
++#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
+ #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
+ #endif
+