diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-08 09:41:36 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-08 09:52:34 +0200 |
commit | faa5163a269b429c1d6bfd4387ced0aaff4eba69 (patch) | |
tree | 715edf950cf9da83e31548935e06f1be157c4788 /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch | |
parent | afcde8567252191820ed07abcc241f3794b75988 (diff) | |
download | meta-qt5-faa5163a269b429c1d6bfd4387ced0aaff4eba69.tar.gz |
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/0020-chromium-musl-linux-glibc-make-the-distinction.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..55939ddd --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From 350b57a5cad7c655ccb68a8b4b91e7d32021a1d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | ||
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | ||
5 | |||
6 | Signed-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 | |||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | ||
12 | index 5ea77ef2d27..85343a13905 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) && BUILDFLAG(USE_TCMALLOC) && \ | ||
20 | +#elif defined(__GLIBC__) && BUILDFLAG(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. | ||