diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:55:56 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:59:12 +0100 |
commit | b814111ed28cab46d9d896919b2b5fe308614e1d (patch) | |
tree | 09b7b2ee7a67ed0e732cc8d789499dde4b90bc8f /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
parent | 1fde17e1a570aa5495ecbe8a8daae95b628db260 (diff) | |
download | meta-qt5-b814111ed28cab46d9d896919b2b5fe308614e1d.tar.gz |
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
* fixes 0004-mkspecs-Allow-builds-with-libc-glibc.patch which didn't apply at all,
because the modified mkspecs/features/configure.prf was dropped completely in:
commit 047d61f188aae3fe3ebc689900b8a5c9fb6e901d
Author: Michal Klocek michal.klocek@qt.io
Date: Fri Aug 9 17:40:29 2019 +0200
Add webengine-core feature
The same chunk can be found in src/buildtools/config/support.pri, so I've updated
the .patch accordingly, but haven't tried the build with musl yet.
* fixes 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch to apply
ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_patch: Command Error: 'quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch
patching file chromium/cc/base/list_container_helper.cc
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file chromium/cc/base/list_container_helper.cc
patching file chromium/cc/base/list_container_helper.h
Hunk #1 FAILED at 8.
Hunk #2 succeeded at 174 with fuzz 1.
1 out of 2 hunks FAILED -- rejects in file chromium/cc/base/list_container_helper.h
Patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch does not apply (enforce with -f)
ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/log.do_patch.21067
NOTE: recipe qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0: task do_patch: Failed
ERROR: Task (/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_patch) failed with exit code '1'
* build is still going (it will be a while on my slow builder)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..81d555f9 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | ||
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | ||
5 | for musl | ||
6 | |||
7 | Signed-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 | |||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | ||
13 | index e6838ebda84..7296cc9ed81 100644 | ||
14 | --- a/chromium/base/allocator/allocator_shim.cc | ||
15 | +++ b/chromium/base/allocator/allocator_shim.cc | ||
16 | @@ -351,7 +351,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 defined(USE_TCMALLOC) | ||
21 | +#if defined(USE_TCMALLOC) && defined(__GLIBC__) | ||
22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" | ||
23 | #endif | ||
24 | |||