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/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.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/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..2fdb0d82 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/base/process/process_metrics_posix.cc | 4 ++-- | ||
9 | chromium/base/trace_event/malloc_dump_provider.cc | 2 ++ | ||
10 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | ||
13 | index 5763432aa4f..ff00b7307c0 100644 | ||
14 | --- a/chromium/base/process/process_metrics_posix.cc | ||
15 | +++ b/chromium/base/process/process_metrics_posix.cc | ||
16 | @@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() { | ||
17 | malloc_statistics_t stats = {0}; | ||
18 | malloc_zone_statistics(nullptr, &stats); | ||
19 | return stats.size_in_use; | ||
20 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | ||
21 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | ||
22 | struct mallinfo minfo = mallinfo(); | ||
23 | #if defined(USE_TCMALLOC) | ||
24 | return minfo.uordblks; | ||
25 | #else | ||
26 | return minfo.hblkhd + minfo.arena; | ||
27 | #endif | ||
28 | -#elif defined(OS_FUCHSIA) | ||
29 | +#else | ||
30 | // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. | ||
31 | return 0; | ||
32 | #endif | ||
33 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | ||
34 | index 0077d8b0aec..c69f893f4e9 100644 | ||
35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | ||
36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | ||
37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | ||
38 | // the current process. | ||
39 | bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
40 | ProcessMemoryDump* pmd) { | ||
41 | +#if defined(__GLIBC__) | ||
42 | { | ||
43 | base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); | ||
44 | if (!emit_metrics_on_memory_dump_) | ||
45 | @@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
46 | MemoryAllocatorDump::kUnitsBytes, | ||
47 | resident_size - allocated_objects_size); | ||
48 | } | ||
49 | +#endif // __GLIBC__ | ||
50 | return true; | ||
51 | } | ||
52 | |||