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/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |
parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
download | meta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz |
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/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..d817c3d0 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 107051f8490498b30757d79c97f9309057bc4cc8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | ||
5 | |||
6 | musl libc does not have sbrk. on musl libc will only work when called with 0 as | ||
7 | argument, so we just let it out for now | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
15 | index 59c1b6fb5f6..10f0786d829 100644 | ||
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
18 | @@ -213,7 +213,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | ||
19 | return result; | ||
20 | } | ||
21 | |||
22 | -#ifndef __UCLIBC__ | ||
23 | +#if !defined(__UCLIBC__) && defined(__GLIBC__) | ||
24 | // libc's version: | ||
25 | extern "C" void* __sbrk(intptr_t increment); | ||
26 | |||