diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2017-08-25 21:49:43 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2017-08-25 21:49:43 +0000 |
| commit | b66af6a13eba5d77b7893ac9e5eb5bc26a51900f (patch) | |
| tree | 721c2169a95c24bc52aeb5fbac178951f7ef32f0 /meta-pkgs | |
| parent | b3da03d9874a2658ff17e7fb4826776422afd193 (diff) | |
| download | pkgsrc-b66af6a13eba5d77b7893ac9e5eb5bc26a51900f.tar.gz | |
Fix boost-libs gcc 5.4.0 build with joerg's "not everything is an enum" suggestion.
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/boost/distinfo | 3 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-boost_stacktrace_detail_collect__unwind.ipp | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index ab81dc5c8c0..7bf586fd94e 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.103 2017/08/24 19:31:32 adam Exp $ +$NetBSD: distinfo,v 1.104 2017/08/25 21:49:43 prlw1 Exp $ SHA1 (boost_1_65_0.tar.bz2) = f9260074ecfb31f3e65322fae9c15cc423c0ad59 RMD160 (boost_1_65_0.tar.bz2) = 375254511112fb52928138ec7ea43f290d62601e @@ -18,6 +18,7 @@ SHA1 (patch-boost_math_tools_config.hpp) = daf8cf1fdac8169825c06804ca6d667792be0 SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 +SHA1 (patch-boost_stacktrace_detail_collect__unwind.ipp) = a0e9722872121ddc0db6b0d370e848ad5b315d43 SHA1 (patch-boost_test_impl_execution__monitor.ipp) = bab0d31f9ae0516de343cc2c6c5b08f6154ba8d5 SHA1 (patch-boostcpp.jam) = 8914fe56f183649a394032513483e29d1c49e30c SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 diff --git a/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_collect__unwind.ipp b/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_collect__unwind.ipp new file mode 100644 index 00000000000..f97525ac119 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_collect__unwind.ipp @@ -0,0 +1,27 @@ +$NetBSD: patch-boost_stacktrace_detail_collect__unwind.ipp,v 1.1 2017/08/25 21:49:43 prlw1 Exp $ + +Fix build with gcc 5.4.0 "error: expected id-expression before numeric constant" + +--- boost/stacktrace/detail/collect_unwind.ipp.orig 2017-08-25 18:22:01.228205991 +0000 ++++ boost/stacktrace/detail/collect_unwind.ipp +@@ -31,7 +31,7 @@ inline _Unwind_Reason_Code unwind_callba + unwind_state* const state = static_cast<unwind_state*>(arg); + if (state->frames_to_skip) { + --state->frames_to_skip; +- return _Unwind_GetIP(context) ? ::_URC_NO_REASON : ::_URC_END_OF_STACK; ++ return _Unwind_GetIP(context) ? _URC_NO_REASON : _URC_END_OF_STACK; + } + + *state->current = reinterpret_cast<native_frame_ptr_t>( +@@ -40,9 +40,9 @@ inline _Unwind_Reason_Code unwind_callba + + ++state->current; + if (!*(state->current - 1) || state->current == state->end) { +- return ::_URC_END_OF_STACK; ++ return _URC_END_OF_STACK; + } +- return ::_URC_NO_REASON; ++ return _URC_NO_REASON; + } + + std::size_t this_thread_frames::collect(native_frame_ptr_t* out_frames, std::size_t max_frames_count, std::size_t skip) BOOST_NOEXCEPT { |