DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update boost to 1.66.0

Browse Source
This commit is contained in:
Simon
2018-03-23 15:07:17 -07:00
parent 8ed0346284
commit bbcdabc28d
3 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
depends/packages/boost.mk
View File

@@ -1,9 +1,8 @@
package=boost package=boost
$(package)_version=1_62_0 $(package)_version=1_66_0
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.62.0 $(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.66.0
$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
$(package)_sha256_hash=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 $(package)_sha256_hash=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
$(package)_patches=deprecated_auto_ptr.patch include_poll.patch
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts_release=variant=release $(package)_config_opts_release=variant=release
@@ -26,9 +25,7 @@ $(package)_cxxflags_linux=-fPIC
endef endef
define $(package)_preprocess_cmds 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 && \ 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
endef endef
define $(package)_config_cmds define $(package)_config_cmds

30
depends/patches/boost/deprecated_auto_ptr.patch
View File

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

11
depends/patches/boost/include_poll.patch
View File

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