diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:40 +0000 |
commit | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch) | |
tree | 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |
parent | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff) | |
download | meta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz |
qt5: upgrade to latest revision in 5.12
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete
ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.
* fixes #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch deleted file mode 100644 index 68eaf23e..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From 5532d00e7dcec5529b7510386530cc44bf0b094c 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 | 3 ++- | ||
10 | chromium/content/child/content_child_helpers.cc | 2 +- | ||
11 | 3 files changed, 5 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | ||
14 | index 73a52d6210d..4867198a503 100644 | ||
15 | --- a/chromium/base/process/process_metrics_posix.cc | ||
16 | +++ b/chromium/base/process/process_metrics_posix.cc | ||
17 | @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { | ||
18 | malloc_statistics_t stats = {0}; | ||
19 | malloc_zone_statistics(nullptr, &stats); | ||
20 | return stats.size_in_use; | ||
21 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | ||
22 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | ||
23 | struct mallinfo minfo = mallinfo(); | ||
24 | #if defined(USE_TCMALLOC) | ||
25 | return minfo.uordblks; | ||
26 | #else | ||
27 | return minfo.hblkhd + minfo.arena; | ||
28 | #endif | ||
29 | -#elif defined(OS_FUCHSIA) | ||
30 | +#else | ||
31 | // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. | ||
32 | return 0; | ||
33 | #endif | ||
34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | ||
35 | index ffd519133c2..0c9131e98e4 100644 | ||
36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | ||
37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | ||
38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | ||
39 | // the current process. | ||
40 | bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
41 | ProcessMemoryDump* pmd) { | ||
42 | +#if defined(__GLIBC__) | ||
43 | { | ||
44 | base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); | ||
45 | if (!emit_metrics_on_memory_dump_) | ||
46 | @@ -322,7 +323,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
47 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); | ||
48 | } | ||
49 | tid_dumping_heap_ = kInvalidThreadId; | ||
50 | - | ||
51 | +#endif // __GLIBC__ | ||
52 | return true; | ||
53 | } | ||
54 | |||
55 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc | ||
56 | index 7ddeb4d16a9..b8c73b09c5a 100644 | ||
57 | --- a/chromium/content/child/content_child_helpers.cc | ||
58 | +++ b/chromium/content/child/content_child_helpers.cc | ||
59 | @@ -25,7 +25,7 @@ namespace content { | ||
60 | // though, this provides only a partial and misleading value. | ||
61 | // Unfortunately some telemetry benchmark rely on it and these need to | ||
62 | // be refactored before getting rid of this. See crbug.com/581365 . | ||
63 | -#if defined(OS_LINUX) || defined(OS_ANDROID) | ||
64 | +#if defined(__GLIBC__) || defined(OS_ANDROID) | ||
65 | size_t GetMemoryUsageKB() { | ||
66 | struct mallinfo minfo = mallinfo(); | ||
67 | uint64_t mem_usage = | ||