diff --git a/.gitignore b/.gitignore index b0dac187c..7e7c71a95 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ src/qt/test/moc*.cpp *.pyc *.o *.o-* -*.patch .zcash *.a *.pb.cc diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ee0095d40..7303821be 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -3,7 +3,7 @@ $(package)_version=1_62_0 $(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.62.0 $(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 -$(package)_patches=deprecated_auto_ptr.patch +$(package)_patches=deprecated_auto_ptr.patch include_poll.patch define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -27,7 +27,8 @@ 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)/deprecated_auto_ptr.patch && \ + patch -p1 < $($(package)_patch_dir)/include_poll.patch endef define $(package)_config_cmds diff --git a/depends/patches/boost/include_poll.patch b/depends/patches/boost/include_poll.patch new file mode 100644 index 000000000..b7e544b5f --- /dev/null +++ b/depends/patches/boost/include_poll.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/src/compat.h b/src/compat.h index 20c2a2514..feaa544e2 100644 --- a/src/compat.h +++ b/src/compat.h @@ -32,7 +32,7 @@ #include #include #else -#include +#include #include #include #include