summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-13 00:41:52 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-07-14 23:56:51 +0200
commitd69be5de8c15bfe015c8a6ffb15eee3afb43b841 (patch)
tree225ef848492aa1aa1817d7702215ff413076abb1 /recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch
parent92c634e9d584ebbf508b5ca4fea6d61d38373513 (diff)
downloadmeta-qt5-d69be5de8c15bfe015c8a6ffb15eee3afb43b841.tar.gz
qtwebengine: Fix build on musl
import needed chromium patches from meta-browser Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch
new file mode 100644
index 00000000..a2c2b901
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch
@@ -0,0 +1,29 @@
1From 8a6553232988a5bfc8f0c48d4214a3982025fb2c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:39:57 -0700
4Subject: [PATCH 11/12] Do not define __sbrk on musl
5
6musl libc does not have sbrk. on musl libc will only work when called with 0 as
7argument, so we just let it out for now
8
9Signed-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
14diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index edc8cf2db..a868b50d3 100644
16--- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
19 }
20
21 // Don't hook sbrk() in Android, since it doesn't expose __sbrk.
22-#if !defined(__ANDROID__)
23+#if !defined(__ANDROID__) && defined(__GLIBC__)
24 // libc's version:
25 extern "C" void* __sbrk(ptrdiff_t increment);
26
27--
282.13.2
29