Author: raskin
Date: Thu Jun 16 21:19:13 2011
New Revision: 27488
URL: https://svn.nixos.org/websvn/nix/?rev=27488&sc=1
Log:
Fix build - add a patch from Debian
Added:
nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix
Added: nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patch Thu Jun
16 21:19:13 2011 (r27488)
@@ -0,0 +1,43 @@
+Debian's patch to build with fresher GCC
+
+Index: wvstreams-4.6.1/crypto/wvx509.cc
+===================================================================
+--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584
+0200
++++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
+@@ -1157,7 +1157,7 @@
+
+ if (ext)
+ {
+- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD
*)X509V3_EXT_get(ext);
+ if (!method)
+ {
+ WvDynBuf buf;
+Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
+===================================================================
+--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20
00:02:38.391136584 +0200
++++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20
00:02:35.283136585 +0200
+@@ -1,8 +1,6 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#endif
+
+ WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
+ : socketfile(filename)
+Index: wvstreams-4.6.1/streams/wvatomicfile.cc
+===================================================================
+--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20
00:02:38.223136584 +0200
++++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587
+0200
+@@ -10,10 +10,7 @@
+ #include "wvatomicfile.h"
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+-
+-#ifdef MACOS
+ #include <sys/stat.h>
+-#endif
+
+ WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t
create_mode)
+ : tmp_file(WvString::null)
Modified: nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix Thu Jun
16 15:19:53 2011 (r27487)
+++ nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix Thu Jun
16 21:19:13 2011 (r27488)
@@ -8,6 +8,8 @@
sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4";
};
+ patches = [ ./compile.patch ];
+
preConfigure = ''
find -type f | xargs sed -i 's@/bin/bash@bash@g'
'';
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
