diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-27 09:21:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-05 14:56:55 +0200 |
| commit | a73de388e628a67490cdd7734779d405740b7fa3 (patch) | |
| tree | c6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch | |
| parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
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 <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..f6d604cb --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch @@ -0,0 +1,23 @@ +From 0e1d9c34ad4488733c4cb5ec20b82e3d9473e5b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jul 2017 14:54:38 -0700 +Subject: [PATCH] chromium: musl: linux != glibc, make the distinction + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + chromium/base/allocator/allocator_check.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc +index a5ca0b7191e..e80f67e54f1 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(OS_CHROMEOS)) && \ ++#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \ + 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. |