diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index ab01e32..7828b81 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -4,6 +4,7 @@ $(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/$ $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 $(package)_sha256_hash=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e $(package)_dependencies=libiconv +$(package)_patches=disable_addr2line.patch define $(package)_set_vars $(package)_config_opts=variant=release @@ -27,6 +28,7 @@ $(package)_cxxflags_freebsd=-fPIC endef define $(package)_preprocess_cmds + patch -p1 -i $($(package)_patch_dir)/disable_addr2line.patch && \ echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef diff --git a/contrib/depends/patches/boost/disable_addr2line.patch b/contrib/depends/patches/boost/disable_addr2line.patch new file mode 100644 index 0000000..ad87b00 --- /dev/null +++ b/contrib/depends/patches/boost/disable_addr2line.patch @@ -0,0 +1,42 @@ +Fixes a reproducibility defect. We don't need the library. + +diff --git a/libs/stacktrace/build/Jamfile.v2 b/libs/stacktrace/build/Jamfile.v2 +index 230d5a8b4..d3d74599b 100644 +--- a/libs/stacktrace/build/Jamfile.v2 ++++ b/libs/stacktrace/build/Jamfile.v2 +@@ -42,9 +42,6 @@ rule mp-run-simple ( sources + : args * : input-files * : requirements * : targe + mp-run-simple has_backtrace.cpp : : : backtrace : libbacktrace ; + explicit libbacktrace ; + +-mp-run-simple has_addr2line.cpp : : : : addr2line ; +-explicit addr2line ; +- + mp-run-simple has_windbg.cpp : : : Dbgeng ole32 : WinDbg ; + explicit WinDbg ; + +@@ -76,19 +73,6 @@ lib boost_stacktrace_backtrace + #shared:BOOST_STACKTRACE_DYN_LINK=1 + ; + +-lib boost_stacktrace_addr2line +- : # sources +- ../src/addr2line.cpp +- : # requirements +- all +- linux:dl +- shared:BOOST_STACKTRACE_DYN_LINK=1 +- [ check-target-builds ../build//addr2line : : no ] +- : # default build +- : # usage-requirements +- #shared:BOOST_STACKTRACE_DYN_LINK=1 +- ; +- + lib boost_stacktrace_basic + : # sources + ../src/basic.cpp +@@ -128,4 +112,4 @@ lib boost_stacktrace_windbg_cached + #shared:BOOST_STACKTRACE_DYN_LINK=1 + ; + +-boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_addr2line boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached ; ++boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached ;