Author: simons
Date: Wed Jul 13 10:56:52 2011
New Revision: 27750
URL: https://svn.nixos.org/websvn/nix/?rev=27750&sc=1
Log:
jfsrec: build with boost 1.44.0
Compilation with the latest version, boost 1.47.0, fails as follows:
g++ -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -c -o inode.o inode.cpp
inode.cpp: In member function 'virtual boost::filesystem3::path
jfsrec::Inode::get_full_path()':
inode.cpp:70:54: error: invalid conversion from 'bool (*)(const
std::string&)' to 'boost::enable_if_c<true, void>::type*'
inode.cpp:70:54: error: initializing argument 2 of
'boost::filesystem3::path::path(const Source&, typename
boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename
boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>,
typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename
boost::decay<Source>::type> >::type = void]'
inode.cpp:72:54: error: invalid conversion from 'bool (*)(const
std::string&)' to 'boost::enable_if_c<true, void>::type*'
inode.cpp:72:54: error: initializing argument 2 of
'boost::filesystem3::path::path(const Source&, typename
boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename
boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>,
typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename
boost::decay<Source>::type> >::type = void]'
make[2]: *** [inode.o] Error 1
It appears that jfsrec assumes that fs::path is a string, which isn't
true anymore in Boost.FS v3.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 13 10:50:22
2011 (r27749)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 13 10:56:52
2011 (r27750)
@@ -846,7 +846,9 @@
jdiskreport = callPackage ../tools/misc/jdiskreport { };
- jfsrec = callPackage ../tools/filesystems/jfsrec { };
+ jfsrec = callPackage ../tools/filesystems/jfsrec {
+ boost = boost144;
+ };
jfsutils = callPackage ../tools/filesystems/jfsutils { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
