Tue May 1 18:47:01 2012 UTC ()
Fix building with Clang


(adam)
diff -r1.42 -r1.43 pkgsrc/meta-pkgs/boost/distinfo
diff -r0 -r1.1 pkgsrc/meta-pkgs/boost/patches/patch-boost_xpressive_traits_cpp_regex_traits.hpp
cvs diff -r1.42 -r1.43 pkgsrc/meta-pkgs/boost/distinfo (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/distinfo 2012/02/29 16:37:28 1.42
+++ pkgsrc/meta-pkgs/boost/distinfo 2012/05/01 18:47:01 1.43
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.42 2012/02/29 16:37:28 hans Exp $ 1$NetBSD: distinfo,v 1.43 2012/05/01 18:47:01 adam Exp $
2 2
3SHA1 (boost_1_49_0.tar.bz2) = 26a52840e9d12f829e3008589abf0a925ce88524 3SHA1 (boost_1_49_0.tar.bz2) = 26a52840e9d12f829e3008589abf0a925ce88524
4RMD160 (boost_1_49_0.tar.bz2) = 3504c6f27c63ab52182c822d45d020fa30179abc 4RMD160 (boost_1_49_0.tar.bz2) = 3504c6f27c63ab52182c822d45d020fa30179abc
5Size (boost_1_49_0.tar.bz2) = 48499961 bytes 5Size (boost_1_49_0.tar.bz2) = 48499961 bytes
6SHA1 (patch-aa) = 62bb260fce3bca6dd5f61dd9b179fd40593d31b4 6SHA1 (patch-aa) = 62bb260fce3bca6dd5f61dd9b179fd40593d31b4
7SHA1 (patch-ab) = f1c95ae229465a4d2da76ce6ff88d76ace52fdd8 7SHA1 (patch-ab) = f1c95ae229465a4d2da76ce6ff88d76ace52fdd8
8SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d 8SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d
9SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265 9SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265
10SHA1 (patch-ae) = 2fb49c90bbb3fd797ccdfaaf44c93494a5988f52 10SHA1 (patch-ae) = 2fb49c90bbb3fd797ccdfaaf44c93494a5988f52
11SHA1 (patch-ag) = b19bf29b0c08ede6470e0a697f99d4ea796ab987 11SHA1 (patch-ag) = b19bf29b0c08ede6470e0a697f99d4ea796ab987
12SHA1 (patch-ai) = e55ca82da06d23c362f041b0b5f92bbd09663379 12SHA1 (patch-ai) = e55ca82da06d23c362f041b0b5f92bbd09663379
13SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a 13SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
14SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a 14SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a
 15SHA1 (patch-boost_xpressive_traits_cpp_regex_traits.hpp) = fce4fbb57af7b488d2bda80557272cf7a63040e1
15SHA1 (patch-libs_signals_src_named_slot_map.cpp) = 4e0127e3286e93b6a7cdcd46add582b27dadc0d8 16SHA1 (patch-libs_signals_src_named_slot_map.cpp) = 4e0127e3286e93b6a7cdcd46add582b27dadc0d8
File Added: pkgsrc/meta-pkgs/boost/patches/Attic/patch-boost_xpressive_traits_cpp_regex_traits.hpp
$NetBSD: patch-boost_xpressive_traits_cpp_regex_traits.hpp,v 1.1 2012/05/01 18:47:01 adam Exp $

Fix building with Clang.

--- boost/xpressive/traits/cpp_regex_traits.hpp.orig	2012-05-01 17:25:19.000000000 +0000
+++ boost/xpressive/traits/cpp_regex_traits.hpp
@@ -24,6 +24,7 @@
 #include <boost/assert.hpp>
 #include <boost/integer.hpp>
 #include <boost/mpl/assert.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
@@ -89,7 +90,7 @@ namespace detail
     template<umaskex_t In, umaskex_t Out = highest_bit, bool Done = (0 == (Out & In))>
     struct unused_mask
     {
-        BOOST_MPL_ASSERT_RELATION(1, !=, Out);
+        BOOST_STATIC_ASSERT(1 != Out);
         BOOST_STATIC_CONSTANT(umaskex_t, value = (unused_mask<In, (Out >> 1)>::value));
     };