38bad67383
The idea to have a separate qt-webkit package which builds with gcc6 is taken from the Arch Linux team's efforts: https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/qtwebkit This addresses #4748 the unsolvable(?) problems when trying to build the shipped qtwebkit that comes with qt-4.7.8 with gcc6.
20 lines
800 B
Diff
20 lines
800 B
Diff
--- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
|
|
+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
|
|
@@ -58,7 +58,7 @@
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
|
+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !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__))) && !OS(ANDROID)
|
|
*size = backtrace(stack, *size);
|
|
#elif OS(WINDOWS) && !OS(WINCE)
|
|
// The CaptureStackBackTrace function is available in XP, but it is not defined
|