pyrox.dev
lol
Fix build - add a patch from Debian
svn path=/nixpkgs/trunk/; revision=27488
+45
+43
pkgs/development/libraries/wvstreams/compile.patch
+43
pkgs/development/libraries/wvstreams/compile.patch
···
1
+
Debian's patch to build with fresher GCC
2
+
3
+
Index: wvstreams-4.6.1/crypto/wvx509.cc
4
+
===================================================================
5
+
--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200
6
+
+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
7
+
@@ -1157,7 +1157,7 @@
8
+
9
+
if (ext)
10
+
{
11
+
- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
12
+
+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
13
+
if (!method)
14
+
{
15
+
WvDynBuf buf;
16
+
Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
17
+
===================================================================
18
+
--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200
19
+
+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200
20
+
@@ -1,8 +1,6 @@
21
+
#include "wvunixdgsocket.h"
22
+
-#ifdef MACOS
23
+
#include <sys/types.h>
24
+
#include <sys/stat.h>
25
+
-#endif
26
+
27
+
WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
28
+
: socketfile(filename)
29
+
Index: wvstreams-4.6.1/streams/wvatomicfile.cc
30
+
===================================================================
31
+
--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200
32
+
+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200
33
+
@@ -10,10 +10,7 @@
34
+
#include "wvatomicfile.h"
35
+
#include "wvfileutils.h"
36
+
#include "wvstrutils.h"
37
+
-
38
+
-#ifdef MACOS
39
+
#include <sys/stat.h>
40
+
-#endif
41
+
42
+
WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
43
+
: tmp_file(WvString::null)