summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-21 19:34:01 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-22 14:35:29 +0000
commitef5f5d912da50e43015de0e7fecb482a7cd4a2fd (patch)
tree8f89fe21421a93ffd0141c5743d1cd67d4961bcd /recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
parent820f3ef827b874340e9e42000657a110c9a99440 (diff)
downloadmeta-qt5-ef5f5d912da50e43015de0e7fecb482a7cd4a2fd.tar.gz
qt5: upgrade to 5.11.1
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.patch26
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..e84290e3
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -0,0 +1,26 @@
1From bc578326c48554e2123640869199d0d4505fa357 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] chromium: musl: 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/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index edc8cf2db7..a868b50d30 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@@ -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