diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-26 16:03:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:28 +0000 |
commit | 68da3901c9a778c30c174e85f029d27fc1c7b4ed (patch) | |
tree | 9231ac71eee1f3dd6bf8a7945651d63292c4f123 /meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch | |
parent | da8163504d70de66381db50e5078794a1b61dad4 (diff) | |
download | poky-68da3901c9a778c30c174e85f029d27fc1c7b4ed.tar.gz |
webkitgtk: Fix build with clang/musl
backtrace is glibc only feature on linux so check for glibc before using
it
Clangs clear_cache has different signature than gcc provided builtin
make it compatible for both
(From OE-Core rev: c3dc346d44c8c5485b3eb1a97f32ba2ed2e76ece)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch new file mode 100644 index 0000000000..d7e4ef6263 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 0b68ad206d2d90df78d91cad4da19152084014cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 16 Sep 2015 05:15:04 +0000 | ||
4 | Subject: [PATCH] Enable backtrace on linux when using glibc | ||
5 | |||
6 | We dont have backtrace() implemented on non-glibc libc's on linux | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Accepted | ||
11 | |||
12 | Source/WTF/wtf/Assertions.cpp | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp | ||
16 | index 191d53f..a4d86b5 100644 | ||
17 | --- a/Source/WTF/wtf/Assertions.cpp | ||
18 | +++ b/Source/WTF/wtf/Assertions.cpp | ||
19 | @@ -68,7 +68,7 @@ | ||
20 | #include <unistd.h> | ||
21 | #endif | ||
22 | |||
23 | -#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) | ||
24 | +#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) | ||
25 | #include <cxxabi.h> | ||
26 | #include <dlfcn.h> | ||
27 | #include <execinfo.h> | ||
28 | @@ -225,7 +225,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f | ||
29 | |||
30 | void WTFGetBacktrace(void** stack, int* size) | ||
31 | { | ||
32 | -#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) | ||
33 | +#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) | ||
34 | *size = backtrace(stack, *size); | ||
35 | #elif OS(WINDOWS) | ||
36 | // The CaptureStackBackTrace function is available in XP, but it is not defined | ||
37 | -- | ||
38 | 2.5.2 | ||
39 | |||