From a73de388e628a67490cdd7734779d405740b7fa3 Mon Sep 17 00:00:00 2001 From: Jani Suonpera Date: Wed, 27 Jan 2021 09:21:29 +0200 Subject: qt5: update submodules for LTS 5.15 - Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo --- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (limited to 'recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..2e3b1155 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -0,0 +1,52 @@ +From ee3e05b09ad149ea02d9d4b743ea75cdc38a6f4e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:09:06 -0700 +Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux + +Signed-off-by: Khem Raj +--- + chromium/base/process/process_metrics_posix.cc | 4 ++-- + chromium/base/trace_event/malloc_dump_provider.cc | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc +index 9d12c427bb3..900ab13519f 100644 +--- a/chromium/base/process/process_metrics_posix.cc ++++ b/chromium/base/process/process_metrics_posix.cc +@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() { + malloc_statistics_t stats = {0}; + malloc_zone_statistics(nullptr, &stats); + return stats.size_in_use; +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + struct mallinfo minfo = mallinfo(); + #if BUILDFLAG(USE_TCMALLOC) + return minfo.uordblks; + #else + return minfo.hblkhd + minfo.arena; + #endif +-#elif defined(OS_FUCHSIA) ++#else + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. + return 0; + #endif +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc +index c327f486596..90129e851e8 100644 +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc +@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; + // the current process. + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { ++#if defined(__GLIBC__) + { + base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); + if (!emit_metrics_on_memory_dump_) +@@ -170,6 +171,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + MemoryAllocatorDump::kUnitsBytes, + resident_size - allocated_objects_size); + } ++#endif // __GLIBC__ + return true; + } + -- cgit v1.2.3-54-g00ecf