summaryrefslogtreecommitdiff
path: root/meta-pkgs/boost
diff options
context:
space:
mode:
authorjoerg <joerg>2014-02-21 20:22:08 +0000
committerjoerg <joerg>2014-02-21 20:22:08 +0000
commitfd4694cfa876e3e21a73418cad5e6a291ad28550 (patch)
tree8330c959080f2c58592215786b744a6356bb0727 /meta-pkgs/boost
parentb4d493ff7789823ed21f3baa2b7e8edbe691efb4 (diff)
downloadpkgsrc-fd4694cfa876e3e21a73418cad5e6a291ad28550.tar.gz
Disable container forward definitions for libc++, it doesn't agree with
the use of inline namespaces.
Diffstat (limited to 'meta-pkgs/boost')
-rw-r--r--meta-pkgs/boost/distinfo3
-rw-r--r--meta-pkgs/boost/patches/patch-boost_config_stdlib_libcpp.hpp12
2 files changed, 14 insertions, 1 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 79ef7c0b8c6..0e42dc65a90 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2013/11/20 19:17:55 adam Exp $
+$NetBSD: distinfo,v 1.62 2014/02/21 20:22:08 joerg Exp $
SHA1 (boost_1_55_0.tar.bz2) = cef9a0cc7084b1d639e06cd3bc34e4251524c840
RMD160 (boost_1_55_0.tar.bz2) = de8ef647933a005119425326b59723aad4a6fd4f
@@ -13,6 +13,7 @@ SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3
SHA1 (patch-boost_archive_iterators_transform__width.hpp) = 5c08bac63fcc259997a8cf6fac1684f45ef7cd1a
SHA1 (patch-boost_asio_detail_config.hpp) = b95ca6b0bb6c805624cb81c91c3f1b691a7425ca
+SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d243325d3aeb180e4ed7a1fd7d89782d832fa9fc
SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff
SHA1 (patch-boost_noncopyable.hpp) = 6567b5932c6bb48e8b2fcae48ff47e0f230fc1b9
SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
diff --git a/meta-pkgs/boost/patches/patch-boost_config_stdlib_libcpp.hpp b/meta-pkgs/boost/patches/patch-boost_config_stdlib_libcpp.hpp
new file mode 100644
index 00000000000..c3dcac0dedd
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-boost_config_stdlib_libcpp.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-boost_config_stdlib_libcpp.hpp,v 1.1 2014/02/21 20:22:09 joerg Exp $
+
+--- boost/config/stdlib/libcpp.hpp.orig 2014-02-21 00:34:58.000000000 +0000
++++ boost/config/stdlib/libcpp.hpp
+@@ -33,5 +33,7 @@
+
+ // libc++ uses a non-standard messages_base
+ #define BOOST_NO_STD_MESSAGES
++// libc++ uses inline namespaces
++#define BOOST_DETAIL_NO_CONTAINER_FWD
+
+ // --- end ---