diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:34 +0000 |
| commit | d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe (patch) | |
| tree | e12362298f3ce80a2f24b9200d2ec9342d4c7f22 /recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |
| parent | 8c7797ba5a2c2ba39a4389954b2ca72efc37e036 (diff) | |
| download | meta-qt5-d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe.tar.gz | |
qtwebengine: update chromium musl patchset
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0012-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/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..0414a905 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 18cc6e16f45eafb89f19d507c02d573ab5429246 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 7486a05a272..610a10b659a 100755 | ||
| 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 | @@ -206,7 +206,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 | |||
