diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-07-16 12:44:19 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-17 10:32:59 +0000 |
| commit | 8f0e74102237fc3d2eeb5012e8fd4ed28ff33503 (patch) | |
| tree | 8b0ac31c08a2248811ba5e77ada93ca933e1e686 /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch | |
| parent | c8b3085aa4b0030d6ef07b4703763692c2c58ec0 (diff) | |
| download | meta-qt5-8f0e74102237fc3d2eeb5012e8fd4ed28ff33503.tar.gz | |
qtwebengine: Fix build on aarch64
adapt a patch from meta-browser to get aarch64 going
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..8ca842eb --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | From 0dbb65a8a1633a8fe1704ddc0f299799998cc9b0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | ||
| 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | chromium/base/allocator/allocator_check.cc | 2 +- | ||
| 9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 10 | |||
| 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | ||
| 12 | index 5fb86467dde..9864858eb67 100644 | ||
| 13 | --- a/chromium/base/allocator/allocator_check.cc | ||
| 14 | +++ b/chromium/base/allocator/allocator_check.cc | ||
| 15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { | ||
| 16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the | ||
| 17 | // shimmed _set_new_mode() is called. | ||
| 18 | return g_is_win_shim_layer_initialized; | ||
| 19 | -#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ | ||
| 20 | +#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ | ||
| 21 | !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) | ||
| 22 | // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. | ||
| 23 | // TODO(primiano): replace with an include once base can depend on allocator. | ||
