diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-08 09:41:36 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-08 09:52:34 +0200 |
commit | faa5163a269b429c1d6bfd4387ced0aaff4eba69 (patch) | |
tree | 715edf950cf9da83e31548935e06f1be157c4788 /recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |
parent | afcde8567252191820ed07abcc241f3794b75988 (diff) | |
download | meta-qt5-faa5163a269b429c1d6bfd4387ced0aaff4eba69.tar.gz |
qtwebengine: refresh the patches
* update to match
https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.8
https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15-glibc.meta-qt5.8
https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based-glibc 80-based-glibc.meta-qt5.4
https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 80-based.meta-qt5.4
* 0002-icu-use-system-library-only-targets.patch is only for chromium, so it was
updated and moved to right place in SRC_URI
* 0014-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch prefix was moved
to src/3rdparty not src/3rdparty/chromium so that it can apply with "git am"
together with other chromium patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0024-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/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..cd1059e3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 64e79d346a2038b976f5bafe2b0b2032b1628229 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 | |||