Skip to content

Commit

Permalink
SERVER-44079 Upgrade boost from 1.70.0 to 1.76.0
Browse files Browse the repository at this point in the history
This reverts commit ea13620.
  • Loading branch information
acmorrow authored and Evergreen Agent committed May 13, 2021
1 parent 5f0de7f commit 625a889
Show file tree
Hide file tree
Showing 7,913 changed files with 501,461 additions and 241,376 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion README.third_party.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ a notice will be included in
| Aladdin MD5 | Zlib | | Unknown |||
| [ASIO] | BSL-1.0 | 1.16.1 | b0926b61b0 | ||
| [benchmark] | Apache-2.0 | 1.5.2 | 1.5.2 | | |
| [Boost] | BSL-1.0 | 1.73.0 | 1.70.0 | ||
| [Boost] | BSL-1.0 | 1.76.0 | 1.76.0 | ||
| [fmt] | BSD-2-Clause | 7.1.3 | 7.1.3 | ||
| [GPerfTools] | BSD-3-Clause | 2.8 | 2.8 | ||
| [ICU4] | ICU | 67.1 | 57.1 |||
Expand Down
3 changes: 1 addition & 2 deletions etc/third_party_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ components:
homepage_url: https://www.boost.org/
open_hub_url: https://www.openhub.net/p/boost
release_monitoring_id: 6845
local_directory_path: src/third_party/boost-1.70.0
local_directory_path: src/third_party/boost
team_owner: "Service Architecture"
upgrade_suppression: TODO SERVER-44079

concurrencytest:
homepage_url: https://github.com/cgoldberg/concurrencytest
Expand Down
23 changes: 20 additions & 3 deletions src/third_party/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -82,8 +81,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'):
Expand Down Expand Up @@ -312,7 +329,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 })
Expand Down
88 changes: 0 additions & 88 deletions src/third_party/boost-1.70.0/boost/algorithm/algorithm.hpp

This file was deleted.

185 changes: 0 additions & 185 deletions src/third_party/boost-1.70.0/boost/algorithm/cxx11/is_permutation.hpp

This file was deleted.

0 comments on commit 625a889

Please sign in to comment.