Auto merge of #3113 - bitcartel:update_boost_1.66.0, r=str4d

Update boost to 1.66.0

- Remove no longer required patch `deprecated_auto_ptr.patch`.
- Remove potentially no longer required patch `include_poll.patch`. This might cause a regression for unsupported platform Alpine Linux (see #1559)

configure.ac

@@ -755,7 +755,7 @@ AX_CHECK_COMPILE_FLAG([-fwrapv],[CXXFLAGS="$CXXFLAGS -fwrapv"])
 AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]])
 
-LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium $RUST_LIBS"
+LIBZCASH_LIBS="-lgmp -lgmpxx $BOOST_SYSTEM_LIB -lcrypto -lsodium $RUST_LIBS"
 
 AC_MSG_CHECKING([whether to build bitcoind])
 AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])

depends/packages/boost.mk

@@ -1,15 +1,14 @@
 package=boost
-$(package)_version=1_62_0
-$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.62.0
+$(package)_version=1_66_0
+$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.66.0
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
-$(package)_sha256_hash=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0
-$(package)_patches=deprecated_auto_ptr.patch include_poll.patch
+$(package)_sha256_hash=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
 $(package)_config_opts_debug=variant=debug
-$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam
-$(package)_config_opts+=link=static -sNO_BZIP2=1 -sNO_ZLIB=1
+$(package)_config_opts=--layout=system --user-config=user-config.jam
+$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
 $(package)_config_opts_darwin=--toolset=darwin-4.2.1 runtime-link=shared
 $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
@@ -26,9 +25,7 @@ $(package)_cxxflags_linux=-fPIC
 endef
 
 define $(package)_preprocess_cmds
-  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam && \
-   patch -p1 < $($(package)_patch_dir)/deprecated_auto_ptr.patch && \
-   patch -p1 < $($(package)_patch_dir)/include_poll.patch
+  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
 define $(package)_config_cmds

depends/patches/boost/deprecated_auto_ptr.patch

@@ -1,30 +0,0 @@
---- boost_1_62_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2016-09-29 14:03:47.317997658 +1300
-+++ boost_1_62_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2016-09-29 14:07:41.308726372 +1300
-@@ -13,10 +13,16 @@
- 
- #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
- #include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
-+#include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
- #include <algorithm>
- #include <functional>
- #include <memory> // for std::auto_ptr
- #include <boost/weak_ptr.hpp>
-+
-+#if defined( BOOST_SP_DISABLE_DEPRECATED )
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-+#endif
- #endif
- 
- #ifdef BOOST_SPIRIT_THREADSAFE
-@@ -370,4 +376,10 @@
- 
- }} // namespace boost::spirit
- 
-+#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
-+#if defined( BOOST_SP_DISABLE_DEPRECATED )
-+#pragma GCC diagnostic pop
-+#endif
-+#endif
-+
- #endif

depends/patches/boost/include_poll.patch

@@ -1,11 +0,0 @@
---- boost_1_62_0-orig/boost/asio/detail/socket_types.hpp	2016-09-21 15:33:21.000000000 +0100
-+++ boost_1_62_0/boost/asio/detail/socket_types.hpp	2016-10-18 03:08:41.712254217 +0100
-@@ -58,7 +58,7 @@
- #else
- # include <sys/ioctl.h>
- # if !defined(__SYMBIAN32__)
--#  include <sys/poll.h>
-+#  include <poll.h>
- # endif
- # include <sys/types.h>
- # include <sys/stat.h>

src/snark/Makefile

@@ -19,7 +19,7 @@ DEPINST = depinst
 
 CXXFLAGS += -I$(DEPINST)/include -Ilibsnark
 LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
-LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium
+LDLIBS += -lgmpxx -lgmp -lboost_program_options -lsodium
 # List of .a files to include within libsnark.a and libsnark.so:
 AR_LIBS =
 # List of library files to install: