diff options
Diffstat (limited to 'devel/boost-libs/files')
3 files changed, 62 insertions, 4 deletions
diff --git a/devel/boost-libs/files/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp b/devel/boost-libs/files/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp new file mode 100644 index 000000000000..e3f835f74237 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp @@ -0,0 +1,14 @@ +https://github.com/boostorg/wave/pull/31 + +--- boost/wave/cpplexer/re2clex/cpp_re.hpp.orig 2018-04-09 15:17:58 UTC ++++ boost/wave/cpplexer/re2clex/cpp_re.hpp +@@ -373,6 +373,9 @@ boost::wave::token_id scan(Scanner<Iterator> *s) + string_type rawstringdelim; // for use with C++11 raw string literals + + // include the correct Re2C token definition rules ++#if (defined (__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__)) && defined (T_DIVIDE) ++#undef T_DIVIDE ++#endif + #if BOOST_WAVE_USE_STRICT_LEXER != 0 + #include "strict_cpp_re.inc" + #else diff --git a/devel/boost-libs/files/patch-libs_fiber_src_numa_freebsd_pin__thread.cpp b/devel/boost-libs/files/patch-libs_fiber_src_numa_freebsd_pin__thread.cpp new file mode 100644 index 000000000000..b61512f9cdff --- /dev/null +++ b/devel/boost-libs/files/patch-libs_fiber_src_numa_freebsd_pin__thread.cpp @@ -0,0 +1,44 @@ +https://github.com/boostorg/fiber/pull/171 + +--- libs/fiber/src/numa/freebsd/pin_thread.cpp.orig 2018-04-09 15:17:50 UTC ++++ libs/fiber/src/numa/freebsd/pin_thread.cpp +@@ -7,10 +7,8 @@ + #include "boost/fiber/numa/pin_thread.hpp" + + extern "C" { +-#include <errno.h> +-#include <sys/param.h> +-#include <sys/cpuset.h> +-#include <sys/thread.h> ++#include <pthread.h> ++#include <pthread_np.h> + } + + #include <system_error> +@@ -25,18 +23,19 @@ namespace numa { + + BOOST_FIBERS_DECL + void pin_thread( std::uint32_t cpuid) { +- pin_thread( cpuid, ::thr_self() ); ++ pin_thread( cpuid, ::pthread_self() ); + } + + BOOST_FIBERS_DECL + void pin_thread( std::uint32_t cpuid, std::thread::native_handle_type h) { +- cpuset_t mask; +- CPU_ZERO( & mask); +- CPU_SET( cpuid, & mask); +- if ( BOOST_UNLIKELY( 0 != ::cpuset_setaffinity( CPU_LEVEL_WHICH, CPU_WHICH_TID, h, sizeof( mask), & mask) ) ) { ++ cpuset_t set; ++ CPU_ZERO( & set); ++ CPU_SET( cpuid, & set); ++ int err = 0; ++ if ( BOOST_UNLIKELY( 0 != ( err = ::pthread_setaffinity_np( h, sizeof( set), & set) ) ) ) { + throw std::system_error( +- std::error_code( errno, std::system_category() ), +- "::cpuset_setaffinity() failed"); ++ std::error_code( err, std::system_category() ), ++ "pthread_setaffinity_np() failed"); + } + } + diff --git a/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam b/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam index 0d40125965dc..0fa762fcccff 100644 --- a/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam +++ b/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam @@ -3,11 +3,11 @@ doesn't exist while /usr/lib only constains .so but not .so.SOVERSION files. Besides, LD_LIBRARY_PATH + -Wl,-rpath-link is same as -Wl,-rpath that USE_GCC already passes. ---- tools/build/src/tools/gcc.jam.orig 2016-09-21 14:33:28 UTC +--- tools/build/src/tools/gcc.jam.orig 2018-04-09 15:17:58 UTC +++ tools/build/src/tools/gcc.jam -@@ -210,24 +210,6 @@ rule init ( version ? : command * : options * ) +@@ -213,24 +213,6 @@ rule init ( version ? : command * : options * : requir + toolset.add-defaults $(conditionx)\:<target-os>$(target-os) ; } - init-link-flags gcc $(linker) $(condition) ; - # If gcc is installed in a non-standard location, we would need to add - # LD_LIBRARY_PATH when running programs created with it (for unit-test/run @@ -22,7 +22,7 @@ that USE_GCC already passes. - local lib_path = $(root)/bin $(root)/lib $(root)/lib32 $(root)/lib64 ; - if $(.debug-configuration) - { -- ECHO notice: using gcc libraries :: $(condition) :: $(lib_path) ; +- ECHO "notice:" using gcc libraries "::" $(condition) "::" $(lib_path) ; - } - toolset.flags gcc.link RUN_PATH $(condition) : $(lib_path) ; - } |