From a9f62bdda0347e11b9b5b561204605630bda3ef0 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 1 Oct 2020 12:09:02 +0100 Subject: [PATCH] depends: Boost 1.74.0 - The old patch is no longer necessary because of this upstream fix: https://github.com/boostorg/build/pull/560 - Boost 1.72 removed a from an include, which exposed a missing include in src/httpserver.cpp. - Boost 1.73 moved function placeholders into the boost::placeholders namespace. - The new patch is a fix from just after Boost 1.74 was released, fixing a warning that was missed. --- depends/packages/boost.mk | 10 ++++---- depends/patches/boost/darwin.diff | 27 ---------------------- depends/patches/boost/signals2-noise.patch | 23 ++++++++++++++++++ qa/zcash/postponed-updates.txt | 4 ---- src/gtest/test_deprecation.cpp | 1 + src/httpserver.cpp | 1 + src/scheduler.cpp | 3 ++- src/test/scheduler_tests.cpp | 2 +- src/validationinterface.cpp | 2 ++ 9 files changed, 35 insertions(+), 38 deletions(-) delete mode 100644 depends/patches/boost/darwin.diff create mode 100644 depends/patches/boost/signals2-noise.patch diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ff0deb9be..35b929613 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,9 +1,9 @@ package=boost -$(package)_version=1_70_0 -$(package)_download_path=https://dl.bintray.com/boostorg/release/1.70.0/source +$(package)_version=1_74_0 +$(package)_download_path=https://dl.bintray.com/boostorg/release/1.74.0/source $(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_sha256_hash=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 -$(package)_patches=darwin.diff +$(package)_sha256_hash=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 +$(package)_patches=signals2-noise.patch define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -27,7 +27,7 @@ $(package)_cxxflags_freebsd=-fPIC endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/darwin.diff + patch -p2 < $($(package)_patch_dir)/signals2-noise.patch endef define $(package)_config_cmds diff --git a/depends/patches/boost/darwin.diff b/depends/patches/boost/darwin.diff deleted file mode 100644 index ec3ed76e4..000000000 --- a/depends/patches/boost/darwin.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/darwin.jam b/darwin.jam -index 8d47741..641d8bb 100644 ---- a/tools/build/src/tools/darwin.jam -+++ b/tools/build/src/tools/darwin.jam -@@ -138,14 +138,14 @@ rule init ( version ? : command * : options * : requirement * ) - common.handle-options darwin : $(condition) : $(command) : $(options) ; - - # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates. -- if $(real-version) < "4.0.0" -- { -- flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; -- } -+# if $(real-version) < "4.0.0" -+# { -+# flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; -+# } - # - GCC 4.2 and higher in Darwin does not have -Wno-long-double. -- if $(real-version) < "4.2.0" -- { -- flags darwin.compile OPTIONS $(condition) : -Wno-long-double ; -- } -+# if $(real-version) < "4.2.0" -+# { -+# flags darwin.compile OPTIONS $(condition) : -Wno-long-double ; -+# } - # - GCC on Darwin with -pedantic, suppress unsupported long long warning - flags darwin.compile OPTIONS $(condition)/all : -Wno-long-long ; diff --git a/depends/patches/boost/signals2-noise.patch b/depends/patches/boost/signals2-noise.patch new file mode 100644 index 000000000..e0a9ce48f --- /dev/null +++ b/depends/patches/boost/signals2-noise.patch @@ -0,0 +1,23 @@ +From fd27423fea5537bc857c1fa14bb0c25b994f77b3 Mon Sep 17 00:00:00 2001 +From: Frank Mori Hess +Date: Mon, 20 Jul 2020 14:17:05 -0400 +Subject: [PATCH] Fix warning about deprecated + boost/function_output_iterator.hpp + +--- + include/boost/signals2/detail/null_output_iterator.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/signals2/detail/null_output_iterator.hpp b/include/boost/signals2/detail/null_output_iterator.hpp +index 9e986959..dee4373c 100644 +--- a/include/boost/signals2/detail/null_output_iterator.hpp ++++ b/include/boost/signals2/detail/null_output_iterator.hpp +@@ -11,7 +11,7 @@ + #ifndef BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP + #define BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP + +-#include ++#include + + namespace boost + { diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 7f06a5457..79fa4974d 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -5,10 +5,6 @@ # bdb 18.1.40 2021-01-20 -boost 1.71.0 2021-01-20 -boost 1.72.0 2021-01-20 -boost 1.73.0 2021-01-20 -boost 1.74.0 2021-01-20 native_rust 1.45.0 2021-01-20 native_rust 1.45.1 2021-01-20 native_rust 1.45.2 2021-01-20 diff --git a/src/gtest/test_deprecation.cpp b/src/gtest/test_deprecation.cpp index ee24e9c94..badd29956 100644 --- a/src/gtest/test_deprecation.cpp +++ b/src/gtest/test_deprecation.cpp @@ -12,6 +12,7 @@ #include #include +using namespace boost::placeholders; using ::testing::StrictMock; static const std::string CLIENT_VERSION_STR = FormatVersion(CLIENT_VERSION); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 878db37ff..134057d51 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -12,6 +12,7 @@ #include "sync.h" #include "ui_interface.h" +#include #include #include #include diff --git a/src/scheduler.cpp b/src/scheduler.cpp index 44bc57ca3..fc0696647 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -7,9 +7,10 @@ #include "reverselock.h" #include -#include #include +#include + CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false) { } diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index f22d3391f..811003440 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -7,7 +7,7 @@ #include "test/test_bitcoin.h" -#include +#include #include #include #include diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 984f68443..d0cc6a264 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -16,6 +16,8 @@ #include #include +using namespace boost::placeholders; + static CMainSignals g_signals; CMainSignals& GetMainSignals()