diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-02-26 15:15:08 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-08-02 23:29:55 -0400 |
| commit | a8a1ea3b9367adb6d0b65a7da21fed89598ea093 (patch) | |
| tree | 8e969ed54b88c2a9c4c2d45a6518d053ac9f4265 /src/third_party | |
| parent | c02c14e30d75b02894da116f4bb1a71652ead2b4 (diff) | |
| download | mongo-a8a1ea3b9367adb6d0b65a7da21fed89598ea093.tar.gz | |
SERVER-26538 SERVER-26539 Detach from boost::thread
Also, use thread_local everywhere for our thread specific data needs
and remove the legacy support.
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/SConscript | 2 | ||||
| -rw-r--r-- | src/third_party/boost-1.60.0/SConscript | 17 | ||||
| -rwxr-xr-x | src/third_party/scripts/boost_get_sources.sh | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 24192468241..cf20fd7edeb 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -150,7 +150,6 @@ if use_system_version_of_library("boost"): SYSLIBDEPS=[ env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'], env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'], - env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'], env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP'], env['LIBDEPS_BOOST_IOSTREAMS_SYSLIBDEP'], ]) @@ -163,7 +162,6 @@ else: LIBDEPS_INTERFACE=[ boostDirectory + '/boost_program_options', boostDirectory + '/boost_filesystem', - boostDirectory + '/boost_thread', boostDirectory + '/boost_system', boostDirectory + '/boost_iostreams', ]) diff --git a/src/third_party/boost-1.60.0/SConscript b/src/third_party/boost-1.60.0/SConscript index a9c4d2d2ae5..5a4ec8f5519 100644 --- a/src/third_party/boost-1.60.0/SConscript +++ b/src/third_party/boost-1.60.0/SConscript @@ -6,23 +6,6 @@ env = env.Clone() env.Library('boost_system', ['libs/system/src/error_code.cpp']) -boost_thread_source = dict( - posix=['libs/thread/src/pthread/once.cpp', - 'libs/thread/src/pthread/thread.cpp'], - windows=['libs/thread/src/win32/thread.cpp', - 'libs/thread/src/win32/tss_pe.cpp'] - ).get(env['TARGET_OS_FAMILY'], 'UNKNOWN_OS_FAMILY_FOR_BOOST_THREADS__%s' % env['TARGET_OS_FAMILY']) - -threadlib_env = env.Clone() -threadlib_env.Append(CPPDEFINES=['BOOST_THREAD_BUILD_LIB']) -threadlib_env.Library('boost_thread', [ - 'libs/thread/src/future.cpp', - 'libs/thread/src/tss_null.cpp' - ] + boost_thread_source, - LIBDEPS=[ - 'boost_system', - ]) - env.Library('boost_filesystem', [ 'libs/filesystem/src/codecvt_error_category.cpp', 'libs/filesystem/src/operations.cpp', diff --git a/src/third_party/scripts/boost_get_sources.sh b/src/third_party/scripts/boost_get_sources.sh index 225e88546a4..9c74b19ff48 100755 --- a/src/third_party/scripts/boost_get_sources.sh +++ b/src/third_party/scripts/boost_get_sources.sh @@ -43,7 +43,7 @@ cd $SRC ./b2 tools/bcp test -d $DEST_DIR || mkdir $DEST_DIR -$SRC/dist/bin/bcp --boost=$SRC/ algorithm align array asio bind iostreams config container date_time filesystem function integer intrusive multi_index noncopyable optional program_options random smart_ptr static_assert thread unordered utility $DEST_DIR +$SRC/dist/bin/bcp --boost=$SRC/ algorithm align array asio bind iostreams config container date_time filesystem function integer intrusive multi_index noncopyable optional program_options random smart_ptr static_assert unordered utility $DEST_DIR # Trim files cd $DEST_DIR |