Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
Date: Sun, 04 Nov 2012 06:30:37
Message-Id: 20121104063016.1DCE8215FF@flycatcher.gentoo.org
1 tetromino 12/11/04 06:30:16
2
3 Added: webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
4 Log:
5 Add patch to fix uclibc backtrace() problem (bug #441674, thanks to Anthony Basile). No revision bump since this only affects uclibc users, and webkit-gtk takes a long time to rebuild. Update license.
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
8
9 Revision Changes Path
10 1.1 net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch?rev=1.1&content-type=text/plain
14
15 Index: webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
16 ===================================================================
17 From: Anthony Basile <blueness@g.o>
18 Date: Sun, 04 Nov 2012 01:51:27 +0000
19
20 webkit-gtk fails to build on a uclibc system because
21 Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
22 /usr/include/execinfo.h and provide backtrace(). But uclibc does not. Its
23 straightforward to extend the test to see if its also a uclibc system and not
24 include execinfo.h or call backtrace().
25
26 --- a/Source/JavaScriptCore/wtf/Assertions.cpp
27 +++ b/Source/JavaScriptCore/wtf/Assertions.cpp
28 @@ -52,7 +52,7 @@
29 #include <windows.h>
30 #endif
31
32 -#if OS(DARWIN) || OS(LINUX)
33 +#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
34 #include <cxxabi.h>
35 #include <dlfcn.h>
36 #include <execinfo.h>
37 @@ -249,7 +249,7 @@
38
39 void WTFGetBacktrace(void** stack, int* size)
40 {
41 -#if OS(DARWIN) || OS(LINUX)
42 +#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
43 *size = backtrace(stack, *size);
44 #elif OS(WINDOWS) && !OS(WINCE)
45 // The CaptureStackBackTrace function is available in XP, but it is not defined