From 9a645b029a7752a83af78c8b69c4c472a3a40a12 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 13 Mar 2020 12:12:45 +0100 Subject: qtwebengine: update patches for latest 5.15 revision Signed-off-by: Martin Jansa --- .../0015-chromium-musl-linux-glibc-make-the-distinction.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch index b9a7caa4..b333dde9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From fdf8296efde5c21e2a89045d18194caa619b4528 Mon Sep 17 00:00:00 2001 +From 30c93cab167ac356cd5340fadd207ba938733e39 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction @@ -9,15 +9,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc -index 5fb86467dde..9864858eb67 100644 +index 5ea77ef2d27..85343a13905 100644 --- a/chromium/base/allocator/allocator_check.cc +++ b/chromium/base/allocator/allocator_check.cc @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { // Set by allocator_shim_override_ucrt_symbols_win.h when the // shimmed _set_new_mode() is called. return g_is_win_shim_layer_initialized; --#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ -+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ +-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \ ++#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. // TODO(primiano): replace with an include once base can depend on allocator. -- cgit v1.2.3-54-g00ecf