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 <deque> 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.
This commit is contained in:
Jack Grigg 2020-10-01 12:09:02 +01:00
parent d3978dbf87
commit a9f62bdda0
9 changed files with 35 additions and 38 deletions

View File

@ -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

View File

@ -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)/<warnings>all : -Wno-long-long ;

View File

@ -0,0 +1,23 @@
From fd27423fea5537bc857c1fa14bb0c25b994f77b3 Mon Sep 17 00:00:00 2001
From: Frank Mori Hess <fmh6jj@gmail.com>
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 <boost/function_output_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
namespace boost
{

View File

@ -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

View File

@ -12,6 +12,7 @@
#include <boost/filesystem/operations.hpp>
#include <fstream>
using namespace boost::placeholders;
using ::testing::StrictMock;
static const std::string CLIENT_VERSION_STR = FormatVersion(CLIENT_VERSION);

View File

@ -12,6 +12,7 @@
#include "sync.h"
#include "ui_interface.h"
#include <deque>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View File

@ -7,9 +7,10 @@
#include "reverselock.h"
#include <assert.h>
#include <boost/bind.hpp>
#include <utility>
#include <boost/bind/bind.hpp>
CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false)
{
}

View File

@ -7,7 +7,7 @@
#include "test/test_bitcoin.h"
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int_distribution.hpp>
#include <boost/thread.hpp>

View File

@ -16,6 +16,8 @@
#include <chrono>
#include <thread>
using namespace boost::placeholders;
static CMainSignals g_signals;
CMainSignals& GetMainSignals()