diff options
| author | joerg <joerg> | 2015-01-15 13:01:44 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-01-15 13:01:44 +0000 |
| commit | 6c63878497f40b9774c60aaa4cdce76cf3edb5b0 (patch) | |
| tree | 4da55dc12ed8518ba13c14445ea7f73cbf6d6e0c | |
| parent | f92d7f89cafb2781d7962293a173de204f65fd8a (diff) | |
| download | pkgsrc-6c63878497f40b9774c60aaa4cdce76cf3edb5b0.tar.gz | |
Don't use plain "throw;", it breaks clang -fno-exceptions build. Bump
revision of boost-headers.
| -rw-r--r-- | devel/boost-headers/Makefile | 3 | ||||
| -rw-r--r-- | meta-pkgs/boost/distinfo | 3 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/devel/boost-headers/Makefile b/devel/boost-headers/Makefile index 7b4f4d72676..9f215ed3a99 100644 --- a/devel/boost-headers/Makefile +++ b/devel/boost-headers/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: Makefile,v 1.32 2015/01/15 13:01:44 joerg Exp $ BOOST_PACKAGE= headers BOOST_COMMENT= (build-time headers) BOOST_CONFIG= generate +PKGREVISION= 1 .include "../../meta-pkgs/boost/Makefile.common" diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 9052bfbc7c3..9b98add71cf 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2014/12/28 16:57:36 fhajny Exp $ +$NetBSD: distinfo,v 1.73 2015/01/15 13:01:44 joerg Exp $ SHA1 (boost_1_57_0.tar.bz2) = e151557ae47afd1b43dc3fac46f8b04a8fe51c12 RMD160 (boost_1_57_0.tar.bz2) = 8365f7c11e5ae088164ab1cb40ac624e76f8e72e @@ -16,6 +16,7 @@ SHA1 (patch-boost_config_posix__features.hpp) = c3e7187af35a2a25901b37388d3194e2 SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d243325d3aeb180e4ed7a1fd7d89782d832fa9fc SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 173271c60b3e2ba7bb1fe9390dcd864ce9742588 SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe +SHA1 (patch-boost_intrusive_circular__list__algorithms.hpp) = 0d54a9e37ead1648710ae0f8f71830bfaec10764 SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 diff --git a/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp b/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp new file mode 100644 index 00000000000..396f74d87bb --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp @@ -0,0 +1,13 @@ +$NetBSD: patch-boost_intrusive_circular__list__algorithms.hpp,v 1.1 2015/01/15 13:01:44 joerg Exp $ + +--- boost/intrusive/circular_list_algorithms.hpp.orig 2015-01-13 12:09:16.000000000 +0000 ++++ boost/intrusive/circular_list_algorithms.hpp +@@ -475,7 +475,7 @@ class circular_list_algorithms + BOOST_CATCH(...){ + node_traits::set_next (last_to_remove, new_f); + node_traits::set_previous(new_f, last_to_remove); +- throw; ++ BOOST_RETHROW + } + BOOST_CATCH_END + node_traits::set_next(last_to_remove, new_f); |