diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:26:38 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:27:39 +0000 |
| commit | dc043a0252c0eb8041b032d88b6f28c9c74a1a7a (patch) | |
| tree | 4b2cba000a4976a865eacfaf000bac700f8eb87c /testing/qt5-qtwebkit/fix-execinfo.patch | |
| parent | 74532119b8110896689d2eeb270c620a89b01f59 (diff) | |
| download | aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.bz2 aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.xz | |
testing/qt5-*: upgrade to 5.2.1, fix musl build
Diffstat (limited to 'testing/qt5-qtwebkit/fix-execinfo.patch')
| -rw-r--r-- | testing/qt5-qtwebkit/fix-execinfo.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/testing/qt5-qtwebkit/fix-execinfo.patch b/testing/qt5-qtwebkit/fix-execinfo.patch new file mode 100644 index 0000000000..6fbf4ed8fd --- /dev/null +++ b/testing/qt5-qtwebkit/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp ++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp +@@ -64,7 +64,7 @@ + #include <windows.h> + #endif + +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID) + #include <cxxabi.h> + #include <dlfcn.h> + #include <execinfo.h> +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined |