diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-09-25 00:08:16 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-09-25 00:08:16 +0000 |
| commit | 98eb11b2f0e873c1d18153e250f15cb2c32e1521 (patch) | |
| tree | bb7ad747880e8b73ba67e7537e487c63a9b9aed7 /devel/boost-libs/files | |
| parent | games/stuntrally: switch to C++11 for Boost (diff) | |
devel/boost-*: update to 1.65.1
Changes: http://www.boost.org/users/history/version_1_65_1.html
PR: 218835
Approved by: maintainer timeout (1.65.1: 2 weeks; 1.65.0: 1 month)
Tested by: jhibbits (on powerpc64, earlier version)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D11582
Diffstat (limited to 'devel/boost-libs/files')
3 files changed, 59 insertions, 14 deletions
diff --git a/devel/boost-libs/files/patch-boost_serialization_array.hpp b/devel/boost-libs/files/patch-boost_serialization_array.hpp deleted file mode 100644 index 3b8a84a619f0..000000000000 --- a/devel/boost-libs/files/patch-boost_serialization_array.hpp +++ /dev/null @@ -1,14 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/12982 -https://github.com/boostorg/serialization/commit/1d8626158123 - ---- boost/serialization/array.hpp.orig 2017-04-17 02:22:24 UTC -+++ boost/serialization/array.hpp -@@ -23,6 +23,8 @@ namespace std{ - } // namespace std - #endif - -+#include <boost/serialization/array_wrapper.hpp> -+ - #ifndef BOOST_NO_CXX11_HDR_ARRAY - - #include <array> diff --git a/devel/boost-libs/files/patch-boost_stacktrace_detail_collect__unwind.ipp b/devel/boost-libs/files/patch-boost_stacktrace_detail_collect__unwind.ipp new file mode 100644 index 000000000000..58b3a75e1d2e --- /dev/null +++ b/devel/boost-libs/files/patch-boost_stacktrace_detail_collect__unwind.ipp @@ -0,0 +1,23 @@ +Expose _Unwind_Backtrace in libcxxrt + +--- boost/stacktrace/detail/collect_unwind.ipp.orig 2017-09-02 09:56:17 UTC ++++ boost/stacktrace/detail/collect_unwind.ipp +@@ -14,7 +14,18 @@ + + #include <boost/stacktrace/safe_dump_to.hpp> + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#define _GNU_SOURCE_TEMPORARY ++#endif + #include <unwind.h> ++#ifdef _GNU_SOURCE_TEMPORARY ++#undef _GNU_SOURCE ++#undef _GNU_SOURCE_TEMPORARY ++#endif ++#if !defined(_URC_NO_REASON) && defined(__arm__) && !defined(__ARM_DWARF_EH__) ++#define _URC_NO_REASON _URC_OK ++#endif + #include <cstdio> + + #if !defined(_GNU_SOURCE) && !defined(BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED) && !defined(BOOST_WINDOWS) diff --git a/devel/boost-libs/files/patch-libs_stacktrace_build_has__addr2line.cpp b/devel/boost-libs/files/patch-libs_stacktrace_build_has__addr2line.cpp new file mode 100644 index 000000000000..5ee8980c4137 --- /dev/null +++ b/devel/boost-libs/files/patch-libs_stacktrace_build_has__addr2line.cpp @@ -0,0 +1,36 @@ +Don't overflow return value from main() + +--- libs/stacktrace/build/has_addr2line.cpp.orig 2017-07-10 14:19:05 UTC ++++ libs/stacktrace/build/has_addr2line.cpp +@@ -4,22 +4,24 @@ + // accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) + +-#include <cstdlib> + #include <string> + + #include <boost/config.hpp> +-#include <unwind.h> +-#include <sys/types.h> +-#include <sys/wait.h> ++#ifdef BOOST_MSVC ++#include <io.h> ++#define X_OK 4 ++#define access _access ++#else ++#include <unistd.h> ++#endif + + int main() { + + #ifdef BOOST_STACKTRACE_ADDR2LINE_LOCATION + std::string s = BOOST_STRINGIZE( BOOST_STACKTRACE_ADDR2LINE_LOCATION ); +- s += " -h"; + #else +- std::string s = "/usr/bin/addr2line -h"; ++ std::string s = "/usr/bin/addr2line"; + #endif + +- return std::system(s.c_str()); ++ return ::access(s.c_str(), X_OK) == -1; + } |