From 012a6e88ef8dedb27851233e5e1bcea03d3c8910 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Tue, 1 May 2012 18:47:01 +0000
Subject: Fix building with Clang

---
 meta-pkgs/boost/distinfo                           |  3 ++-
 ...tch-boost_xpressive_traits_cpp_regex_traits.hpp | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 meta-pkgs/boost/patches/patch-boost_xpressive_traits_cpp_regex_traits.hpp

(limited to 'meta-pkgs')

diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 231a023fc09..32b61d9f592 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2012/02/29 16:37:28 hans Exp $
+$NetBSD: distinfo,v 1.43 2012/05/01 18:47:01 adam Exp $
 
 SHA1 (boost_1_49_0.tar.bz2) = 26a52840e9d12f829e3008589abf0a925ce88524
 RMD160 (boost_1_49_0.tar.bz2) = 3504c6f27c63ab52182c822d45d020fa30179abc
@@ -12,4 +12,5 @@ SHA1 (patch-ag) = b19bf29b0c08ede6470e0a697f99d4ea796ab987
 SHA1 (patch-ai) = e55ca82da06d23c362f041b0b5f92bbd09663379
 SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
 SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a
+SHA1 (patch-boost_xpressive_traits_cpp_regex_traits.hpp) = fce4fbb57af7b488d2bda80557272cf7a63040e1
 SHA1 (patch-libs_signals_src_named_slot_map.cpp) = 4e0127e3286e93b6a7cdcd46add582b27dadc0d8
diff --git a/meta-pkgs/boost/patches/patch-boost_xpressive_traits_cpp_regex_traits.hpp b/meta-pkgs/boost/patches/patch-boost_xpressive_traits_cpp_regex_traits.hpp
new file mode 100644
index 00000000000..1ceef192c4b
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-boost_xpressive_traits_cpp_regex_traits.hpp
@@ -0,0 +1,23 @@
+$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));
+     };
+ 
-- 
cgit v1.2.3