aboutsummaryrefslogtreecommitdiff
path: root/package/webkit/webkit-execinfo_h.patch
diff options
context:
space:
mode:
authorGravatar Markos Chandras <markos.chandras@imgtec.com>2013-09-05 12:37:02 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-09-08 22:50:06 +0200
commit52fcc6a256bcfd541486257bfd05ff12d47aef75 (patch)
tree2314d214305822a55a554b0d967973283794024c /package/webkit/webkit-execinfo_h.patch
parent62146ea3ad78b74d0c17c0fbeaffa2be51070424 (diff)
downloadbuildroot-52fcc6a256bcfd541486257bfd05ff12d47aef75.tar.gz
buildroot-52fcc6a256bcfd541486257bfd05ff12d47aef75.tar.bz2
webkit: Version bump to 1.11.5
Also apply the following patches: - upstream fix for 32-bit autotools - upstream fix for conditional gstreamer build of gtklauncher - upstream fix for detecting the latest harfbuzz - Update existing patch for disabling docs - Update existing patch for execinfo_h - upstream patch for the MIPS DFG support. This fixes compilation problems on MIPS. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/webkit/webkit-execinfo_h.patch')
-rw-r--r--package/webkit/webkit-execinfo_h.patch20
1 files changed, 6 insertions, 14 deletions
diff --git a/package/webkit/webkit-execinfo_h.patch b/package/webkit/webkit-execinfo_h.patch
index 404986b207..f5508a1cb1 100644
--- a/package/webkit/webkit-execinfo_h.patch
+++ b/package/webkit/webkit-execinfo_h.patch
@@ -1,13 +1,14 @@
Fixes uclibc build as uclibc does not include backtrace functionality
Signed-of-by: Spenser Gilliland <spenser@gillilanding.com>
-----
-Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+Signed-of-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: webkit-1.11.5/Source/WTF/wtf/Assertions.cpp
===================================================================
---- webkit-1.9.6.orig/Source/WTF/wtf/Assertions.cpp
-+++ webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+--- webkit-1.11.5.orig/Source/WTF/wtf/Assertions.cpp
++++ webkit-1.11.5/Source/WTF/wtf/Assertions.cpp
@@ -61,8 +61,10 @@
- #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+ #if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
+#if !defined(__UCLIBC__)
@@ -17,12 +18,3 @@ Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
#if OS(ANDROID)
#include "android/log.h"
-@@ -268,7 +270,7 @@ void WTFReportArgumentAssertionFailure(c
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) && !defined(__UCLIBC__)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined