From b19a88b2a0e7bd9ef603055bc8e1ef058673025d Mon Sep 17 00:00:00 2001 From: Jacob Welsh Date: Fri, 12 Jun 2015 14:19:09 -0500 Subject: depends: fix Boost 1.55 build on GCC 5 Boost assumes variadic templates are always available in GCC 4.4+, but they aren't since we don't build with -std=c++11. This applies the patch that fixed the issue in boost 1.57: https://github.com/boostorg/config/commit/eec808554936ae068b23df07ab54d4dc6302a695 See also: https://svn.boost.org/trac/boost/ticket/10500 --- depends/packages/boost.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'depends/packages') diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index f50828c546..e7aa48ddf8 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -3,7 +3,7 @@ $(package)_version=1_55_0 $(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.55.0 $(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 -$(package)_patches=darwin_boost_atomic-1.patch darwin_boost_atomic-2.patch +$(package)_patches=darwin_boost_atomic-1.patch darwin_boost_atomic-2.patch gcc_5_no_cxx11.patch define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -28,6 +28,7 @@ endef define $(package)_preprocess_cmds patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-1.patch && \ patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-2.patch && \ + patch -p2 < $($(package)_patch_dir)/gcc_5_no_cxx11.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 -- cgit v1.2.3