From bbcdabc28d47022dfc86996ccc7d5e271b98be41 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 23 Mar 2018 15:07:17 -0700 Subject: [PATCH 1/5] Update boost to 1.66.0 --- depends/packages/boost.mk | 11 +++---- .../patches/boost/deprecated_auto_ptr.patch | 30 ------------------- depends/patches/boost/include_poll.patch | 11 ------- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 depends/patches/boost/deprecated_auto_ptr.patch delete mode 100644 depends/patches/boost/include_poll.patch diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 7d8d79901..4cb16f0e8 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,9 +1,8 @@ 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 @@ -26,9 +25,7 @@ $(package)_cxxflags_linux=-fPIC endef define $(package)_preprocess_cmds - echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(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) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef define $(package)_config_cmds diff --git a/depends/patches/boost/deprecated_auto_ptr.patch b/depends/patches/boost/deprecated_auto_ptr.patch deleted file mode 100644 index 5ec38e271..000000000 --- a/depends/patches/boost/deprecated_auto_ptr.patch +++ /dev/null @@ -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 -+#include - #include - #include - #include // for std::auto_ptr - #include -+ -+#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 diff --git a/depends/patches/boost/include_poll.patch b/depends/patches/boost/include_poll.patch deleted file mode 100644 index b7e544b5f..000000000 --- a/depends/patches/boost/include_poll.patch +++ /dev/null @@ -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 - # if !defined(__SYMBIAN32__) --# include -+# include - # endif - # include - # include From e6a34c283ad41bc05f18ff4a9b0cd716315df269 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 26 Mar 2018 16:20:55 +0200 Subject: [PATCH 2/5] Revert "remove -mt suffix from boost libraries built by depends" This reverts commit 33ae5edd2cf6c463a817fe7bab45c09a888d3425. --- depends/packages/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 4cb16f0e8..ceeac117c 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -8,7 +8,7 @@ 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+=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 From e6e4b619a9d1cc2b6d4d031b4479f6fc179d91de Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 26 Mar 2018 16:22:35 +0200 Subject: [PATCH 3/5] Use correct Boost::System linker flag for libzcash --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dc414c76d..2b364419e 100644 --- a/configure.ac +++ b/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]) From 1c4a74d40b8999af3231db7bb2c13444a5e9dd86 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 26 Mar 2018 16:23:37 +0200 Subject: [PATCH 4/5] depends: Remove -mt suffix from Boost libraries Requires disabling --build-type=complete, because in Boost 1.66 it appears to be broken (only the tagged libraries are built). --- depends/packages/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ceeac117c..aa1501f95 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -7,7 +7,7 @@ $(package)_sha256_hash=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad7581 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=--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 From 31e6dde84282b2c98112b231214545e63472ae05 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 26 Mar 2018 18:28:07 +0200 Subject: [PATCH 5/5] snark: Remove -mt suffix from Boost library --- src/snark/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/snark/Makefile b/src/snark/Makefile index b865f992f..ad9f0fa00 100644 --- a/src/snark/Makefile +++ b/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: