From 21fb88a34804ba031142af89d2e4df66752b12d3 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 29 Sep 2016 14:15:55 +1300 Subject: [PATCH] Fix auto_ptr deprecation warning in Boost --- depends/packages/boost.mk | 4 ++- .../patches/boost/deprecated_auto_ptr.patch | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 depends/patches/boost/deprecated_auto_ptr.patch diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 19903596..ee0095d4 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -3,6 +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 define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -25,7 +26,8 @@ $(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 + 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 endef define $(package)_config_cmds diff --git a/depends/patches/boost/deprecated_auto_ptr.patch b/depends/patches/boost/deprecated_auto_ptr.patch new file mode 100644 index 00000000..5ec38e27 --- /dev/null +++ b/depends/patches/boost/deprecated_auto_ptr.patch @@ -0,0 +1,30 @@ +--- 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