diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 5e35491c..94e89c42 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -1,9 +1,8 @@ package=boost -$(package)_version=1.85.0 -$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/ -$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.gz -$(package)_sha256_hash=be0d91732d5b0cc6fbb275c7939974457e79b54d6f07ce2e3dfdd68bef883b0b -$(package)_patches=disable_addr2line.patch filesystem_macos_sdk.patch +$(package)_version=1.90.0 +$(package)_download_path=https://github.com/boostorg/boost/releases/download/boost-$($(package)_version) +$(package)_file_name=boost-$($(package)_version)-b2-nodocs.tar.gz +$(package)_sha256_hash=e848446c6fec62d8a96b44ed7352238b3de040b8b9facd4d6963b32f541e00f5 define $(package)_set_vars $(package)_config_opts=variant=release @@ -28,8 +27,6 @@ $(package)_cxxflags_freebsd=-fPIC endef define $(package)_preprocess_cmds - patch -p1 -i $($(package)_patch_dir)/disable_addr2line.patch && \ - patch -p1 -i $($(package)_patch_dir)/filesystem_macos_sdk.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 @@ -43,4 +40,4 @@ endef define $(package)_stage_cmds ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install -endef \ No newline at end of file +endef diff --git a/contrib/depends/patches/boost/disable_addr2line.patch b/contrib/depends/patches/boost/disable_addr2line.patch deleted file mode 100644 index 4c4373d6..00000000 --- a/contrib/depends/patches/boost/disable_addr2line.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 -@@ -48,9 +48,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 ; - -@@ -82,19 +79,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 -@@ -152,4 +136,4 @@ lib boost_stacktrace_from_exception - #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_stacktrace_from_exception ; -+boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached boost_stacktrace_from_exception ; diff --git a/contrib/depends/patches/boost/filesystem_macos_sdk.patch b/contrib/depends/patches/boost/filesystem_macos_sdk.patch deleted file mode 100644 index a502c069..00000000 --- a/contrib/depends/patches/boost/filesystem_macos_sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libs/filesystem/src/directory.cpp b/libs/filesystem/src/directory.cpp -index 0cf5025..cd38e1b 100644 ---- a/libs/filesystem/src/directory.cpp -+++ b/libs/filesystem/src/directory.cpp -@@ -279,7 +279,7 @@ inline system::error_code dir_itr_close(dir_itr_imp& imp) noexcept - // Obtains a file descriptor from the directory iterator - inline int dir_itr_fd(dir_itr_imp const& imp, system::error_code& ec) - { -- int fd = ::dirfd(static_cast< DIR* >(imp.handle)); -+ int fd = dirfd(static_cast< DIR* >(imp.handle)); - if (BOOST_UNLIKELY(fd < 0)) - { - int err = errno;