diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-16 10:22:32 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-16 10:23:34 +0000 |
commit | c8b3085aa4b0030d6ef07b4703763692c2c58ec0 (patch) | |
tree | e3c7e217cd1282a1dba372966efad1c30a013a37 /recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |
parent | c7f882712269735ba9ad307e5d7f5e51f8f84368 (diff) | |
download | meta-qt5-c8b3085aa4b0030d6ef07b4703763692c2c58ec0.tar.gz |
qtwebengine: refresh the patches to apply
* 4 musl patches didn't apply at all
* 0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch is
dropped, because whole chromium/device/serial/serial_io_handler_posix.cc
was removed in upgrade to 73:
commit 38a9a29f4f9436cace7f0e7abf9c586057df8a4e
Author: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed Feb 13 16:23:34 2019 +0100
Subject: BASELINE: Update Chromium to 73.0.3683.37
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0014-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/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..9cbb933c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From b297eebffe2350a76945191e374f6012d1f0fc16 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 | |||