mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-8994: Boost 1.56 build system integration

Browse Source
This commit is contained in:
Mark Benvenuto 2014-08-19 15:06:31 -04:00
parent 09a639ccac
commit 351523db31
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -285,7 +285,7 @@ add_option( "use-system-tcmalloc", "use system version of tcmalloc library", 0,
add_option( "use-system-pcre", "use system version of pcre library", 0, True )
# library choices
boost_choices = ['1.49', '1.55']
boost_choices = ['1.49', '1.56']
add_option( "internal-boost", "Specify internal boost version to use", 1, True,
type='choice', default=boost_choices[0], choices=boost_choices)
@ -977,7 +977,7 @@ if not windows:
boostSuffix = "";
if not use_system_version_of_library("boost"):
if get_option( "internal-boost") != "1.49":
boostSuffix = "-1.55.0"
boostSuffix = "-1.56.0"
env.Prepend(CPPDEFINES=['BOOST_ALL_NO_LIB'])
env.Append( CPPPATH=['$EXTRACPPPATH'],

44
src/third_party/boost-1.56.0/SConscript vendored Normal file
View File

@ -0,0 +1,44 @@
# -*- mode: python; -*-
Import("env")
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'],
win=['libs/thread/src/win32/thread.cpp',
'libs/thread/src/win32/tss_pe.cpp']
).get(env['OS_FAMILY'], 'UNKNOWN_OS_FAMILY_FOR_BOOST_THREADS__%s' % env['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)
env.Library('boost_filesystem', [
'libs/filesystem/src/codecvt_error_category.cpp',
'libs/filesystem/src/operations.cpp',
'libs/filesystem/src/path.cpp',
'libs/filesystem/src/path_traits.cpp',
'libs/filesystem/src/portability.cpp',
'libs/filesystem/src/unique_path.cpp',
'libs/filesystem/src/utf8_codecvt_facet.cpp',
'libs/filesystem/src/windows_file_codecvt.cpp',
])
env.Library('boost_program_options', [
'libs/program_options/src/cmdline.cpp',
'libs/program_options/src/config_file.cpp',
'libs/program_options/src/convert.cpp',
'libs/program_options/src/options_description.cpp',
'libs/program_options/src/parsers.cpp',
'libs/program_options/src/positional_options.cpp',
'libs/program_options/src/split.cpp',
'libs/program_options/src/utf8_codecvt_facet.cpp',
'libs/program_options/src/value_semantic.cpp',
'libs/program_options/src/variables_map.cpp',
'libs/program_options/src/winmain.cpp',
])