diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-04 11:11:01 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-04 11:24:46 +0200 |
| commit | 3815b72ba156c35b962e15d65a52bb4ded404a58 (patch) | |
| tree | 3e1595be115eb37e60a1fc57c242e43e7d26f9f3 /testing/qt5-qtwebengine/qt-musl-mallinfo.patch | |
| parent | de17d5212836b5874586e9f7cfee4381ee2a8401 (diff) | |
| download | aports-3815b72ba156c35b962e15d65a52bb4ded404a58.tar.bz2 aports-3815b72ba156c35b962e15d65a52bb4ded404a58.tar.xz | |
community/qt5-qtwebengine: move from testing
Diffstat (limited to 'testing/qt5-qtwebengine/qt-musl-mallinfo.patch')
| -rw-r--r-- | testing/qt5-qtwebengine/qt-musl-mallinfo.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/testing/qt5-qtwebengine/qt-musl-mallinfo.patch b/testing/qt5-qtwebengine/qt-musl-mallinfo.patch deleted file mode 100644 index 67ce2cb3f7..0000000000 --- a/testing/qt5-qtwebengine/qt-musl-mallinfo.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2018-01-27 20:13:26.960932805 +0100 -@@ -243,7 +243,7 @@ - allocated_objects_count = main_heap_info.block_count; - #elif defined(OS_FUCHSIA) - // TODO(fuchsia): Port, see https://crbug.com/706592. --#else -+#elif defined(__GLIBC__) - struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); - -@@ -255,6 +255,8 @@ - - // Total allocated space is given by |uordblks|. - allocated_objects_size = info.uordblks; -+#else -+// musl libc does not support mallinfo() - #endif - - MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); ---- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2018-01-27 20:48:11.571040348 +0100 -@@ -94,7 +94,7 @@ - malloc_statistics_t stats = {0}; - malloc_zone_statistics(nullptr, &stats); - return stats.size_in_use; --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) - struct mallinfo minfo = mallinfo(); - #if defined(USE_TCMALLOC) - return minfo.uordblks; ---- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2018-01-28 06:23:14.891238507 +0100 -@@ -25,7 +25,7 @@ - // though, this provides only a partial and misleading value. - // Unfortunately some telemetry benchmark rely on it and these need to - // be refactored before getting rid of this. See crbug.com/581365 . --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = |