From 971ede4ef4490ae47a5f32c7d5267b28a68c9190 Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Wed, 28 Apr 2021 10:27:03 -0400 Subject: SERVER-44079 Upgrade boost from 1.70.0 to 1.76.0 --- src/third_party/SConscript | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/third_party/SConscript') diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 87b0774c3d6..32ed1729ba1 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -8,7 +8,6 @@ Import("use_system_libunwind") Import("use_vendored_libunwind") Import("wiredtiger") -boostSuffix = "-1.70.0" snappySuffix = '-1.1.7' zlibSuffix = '-1.2.11' zstdSuffix = '-1.4.4' @@ -83,8 +82,26 @@ if not use_system_version_of_library('pcre'): } if not use_system_version_of_library('boost'): + + + # On at least Apple clang, proto throws this error. + # + # See https://github.com/boostorg/proto/issues/30. + # + # We use a generator so we can filter out conf tests, where applying this + # flag could change their meaning. + def NoErrorForUnknownWarningOptionGenerator(target, source, env, for_signature): + if 'conftest' in str(target[0]): + return str() + return '-Wno-error=unknown-warning-option' + thirdPartyEnvironmentModifications['boost'] = { - 'CPPPATH' : ['#/src/third_party/boost' + boostSuffix], + 'CPPPATH' : ['#/src/third_party/boost'], + + # We could narror further to just clang on Darwin, but there is + # little harm in applying for all clang. + 'NOERROR_FOR_UNKNOWN_WARNING_OPTION_GEN' : NoErrorForUnknownWarningOptionGenerator, + 'CCFLAGS' : ['$NOERROR_FOR_UNKNOWN_WARNING_OPTION_GEN'] if env.ToolchainIs('clang') else [] } if not use_system_version_of_library('abseil-cpp'): @@ -313,7 +330,7 @@ if use_system_version_of_library("boost"): env['LIBDEPS_BOOST_LOG_SYSLIBDEP'], ]) else: - boostDirectory = 'boost' + boostSuffix + boostDirectory = 'boost' boostEnv = boostEnv.Clone() boostEnv.InjectThirdParty(libraries=['boost']) boostEnv.SConscript(boostDirectory + '/SConscript', exports={ 'env' : boostEnv }) -- cgit v1.2.1