1 |
ssuominen 12/06/06 20:33:49 |
2 |
|
3 |
Added: wvstreams-4.6.1-gcc47.patch |
4 |
Log: |
5 |
Pass --localstatedir=/var to correct uniconfd.ini location. Use -fno-strict-aliasing since this package is not ready for aliasing. Fix compability with sys-devel/gcc >= 4.7 wrt #419563 and #419971 by Ioannis Galanomatis. inherit eutils for epatch |
6 |
|
7 |
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: wvstreams-4.6.1-gcc47.patch |
16 |
=================================================================== |
17 |
http://bugs.gentoo.org/419563 |
18 |
http://bugs.gentoo.org/419971 |
19 |
|
20 |
See -gcc47-patch and -magic.patch in Fedora git: |
21 |
|
22 |
http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree |
23 |
|
24 |
--- include/wvtask.h |
25 |
+++ include/wvtask.h |
26 |
@@ -45,7 +45,8 @@ |
27 |
typedef void TaskFunc(void *userdata); |
28 |
|
29 |
static int taskcount, numtasks, numrunning; |
30 |
- int magic_number, *stack_magic; |
31 |
+ int volatile magic_number; |
32 |
+ int *stack_magic; |
33 |
WvString name; |
34 |
int tid; |
35 |
|
36 |
@@ -84,7 +85,7 @@ |
37 |
static WvTaskMan *singleton; |
38 |
static int links; |
39 |
|
40 |
- static int magic_number; |
41 |
+ static int volatile magic_number; |
42 |
static WvTaskList all_tasks, free_tasks; |
43 |
|
44 |
static void get_stack(WvTask &task, size_t size); |
45 |
--- include/wvuid.h |
46 |
+++ include/wvuid.h |
47 |
@@ -7,6 +7,7 @@ |
48 |
#ifndef __WVUID_H |
49 |
#define __WVUID_H |
50 |
|
51 |
+#include <unistd.h> |
52 |
#include "wvstring.h" |
53 |
|
54 |
#if WIN32 |
55 |
--- utils/wvtask.cc |
56 |
+++ utils/wvtask.cc |
57 |
@@ -58,7 +58,8 @@ |
58 |
int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; |
59 |
|
60 |
WvTaskMan *WvTaskMan::singleton; |
61 |
-int WvTaskMan::links, WvTaskMan::magic_number; |
62 |
+int WvTaskMan::links; |
63 |
+int volatile WvTaskMan::magic_number; |
64 |
WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; |
65 |
ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, |
66 |
WvTaskMan::toplevel; |