Commit 417df559 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

qt: update pthread_getattr_np patches for uClibc 0.9.32 



And only when linuxthreads.old is used, as the other thread implementations
don't need it.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 489692fc

package/qt/qt-4.7.3-pthread_getattr_np.patch

+4 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webki 
Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>

--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-02-11 16:55:20.000000000 +0100

+++ qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-05-23 10:49:29.000000000 +0200

@@ -75,6 +75,22 @@

@@ -75,6 +75,23 @@

 #endif

 #include <unistd.h>
@@ -14,11 +14,12 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be> 
+#endif

+

+#if defined(__UCLIBC__)

+// versions of uClibc 0.9.31 and below do not have

+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have

+// pthread_getattr_np or pthread_attr_getstack.

+#if __UCLIBC_MAJOR__ == 0 && \

+    (__UCLIBC_MINOR__ < 9 || \

+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))

+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \

+    defined(__LINUXTHREADS_OLD__)

+#define UCLIBC_USE_PROC_SELF_MAPS 1

+#include <stdio_ext.h>

+extern int *__libc_stack_end;

package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch

+4 −3
Original line number Diff line number Diff line 
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-09-10 11:05:22.000000000 +0200

+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-11-15 16:39:53.000000000 +0100

@@ -70,6 +70,18 @@

@@ -70,6 +70,19 @@

 #endif

 #include <unistd.h>



+#if defined(__UCLIBC__)

+// versions of uClibc 0.9.31 and below do not have

+// versions of uClibc 0.9.32 with linuxthreads.old and below do not have

+// pthread_getattr_np or pthread_attr_getstack.

+#if __UCLIBC_MAJOR__ == 0 && \

+    (__UCLIBC_MINOR__ < 9 || \

+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))

+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) &&

+    defined(__LINUXTHREADS_OLD__)

+#define UCLIBC_USE_PROC_SELF_MAPS 1

+#include <stdio_ext.h>

+extern int* __libc_stack_end;