Fixing boost for a problem related to a "class R shadowing template...".
Taken from: http://wiki.freebsd.org/BoostPortingProject svn path=/nixpkgs/trunk/; revision=15146
This commit is contained in:
parent
c9a740bc26
commit
e0b8a630a8
@ -36,6 +36,8 @@ stdenv.mkDerivation {
|
||||
url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2";
|
||||
sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry";
|
||||
};
|
||||
|
||||
patches = [ ./classr.patch ];
|
||||
|
||||
buildInputs = [icu expat zlib bzip2 python];
|
||||
|
||||
|
15
pkgs/development/libraries/boost/classr.patch
Normal file
15
pkgs/development/libraries/boost/classr.patch
Normal file
@ -0,0 +1,15 @@
|
||||
Taken from http://wiki.freebsd.org/BoostPortingProject
|
||||
--- boost1.38/boost/function/function_template.hpp.orig 2008-10-16 17:21:50.000000000 +0400
|
||||
+++ boost1.38_2/boost/function/function_template.hpp 2009-03-25 04:12:15.000000000 +0300
|
||||
@@ -950,10 +950,10 @@
|
||||
f.vtable->manager(f.functor, this->functor,
|
||||
boost::detail::function::move_functor_tag);
|
||||
f.vtable = 0;
|
||||
-#if !defined(BOOST_NO_EXCEPTIONS)
|
||||
} else {
|
||||
clear();
|
||||
}
|
||||
+#if !defined(BOOST_NO_EXCEPTIONS)
|
||||
} catch (...) {
|
||||
vtable = 0;
|
||||
throw;
|
Loading…
Reference in New Issue
Block a user