summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-23 16:58:04 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-24 07:18:56 +0000
commitf69fc4063ccbc3774df6f73fa59f9558eede8128 (patch)
tree47dbb273d3a4a315e102c3d76f9838172aa9283b /recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
parent7cc177d116ad98d0c922f98aa7f02c2cc655c0ec (diff)
downloadmeta-qt5-f69fc4063ccbc3774df6f73fa59f9558eede8128.tar.gz
qtwebengine: Fix build with musl/gcc9
Provide couple of patches to fix build with x86_64/musl and a new bug found lss via gcc9 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/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, 0 insertions, 26 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
deleted file mode 100644
index 0414a905..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 18cc6e16f45eafb89f19d507c02d573ab5429246 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 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