summaryrefslogtreecommitdiff
path: root/src/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'src/third_party')
-rw-r--r--src/third_party/SConscript90
-rw-r--r--src/third_party/boost/SConscript8
-rw-r--r--src/third_party/gperftools-2.0/SConscript2
-rw-r--r--src/third_party/libstemmer_c/SConscript2
-rw-r--r--src/third_party/murmurhash3/SConscript2
-rw-r--r--src/third_party/pcre-8.30/SConscript2
-rwxr-xr-xsrc/third_party/s2/base/SConscript2
-rwxr-xr-xsrc/third_party/s2/strings/SConscript2
-rwxr-xr-xsrc/third_party/s2/util/coding/SConscript2
-rwxr-xr-xsrc/third_party/s2/util/math/SConscript8
-rw-r--r--src/third_party/snappy/SConscript2
-rw-r--r--src/third_party/v8/SConscript2
12 files changed, 62 insertions, 62 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 95dc24013a6..2a52742b4a2 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -9,81 +9,81 @@ env.SConscript( [
env.Append(CPPPATH='$BUILD_DIR/third_party/s2')
if use_system_version_of_library("pcre"):
- env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
- SYSLIBDEPS=[
- env['LIBDEPS_PCRE_SYSLIBDEP'],
- env['LIBDEPS_PCRECPP_SYSLIBDEP']
- ] )
+ env.Library( "shim_pcrecpp", ['shim_pcrecpp.cc'],
+ SYSLIBDEPS=[
+ env['LIBDEPS_PCRE_SYSLIBDEP'],
+ env['LIBDEPS_PCRECPP_SYSLIBDEP']
+ ] )
else:
env.SConscript('pcre-${PCRE_VERSION}/SConscript')
- env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
- LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] )
+ env.Library( "shim_pcrecpp", ['shim_pcrecpp.cc'],
+ LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] )
if use_system_version_of_library("boost"):
- env.StaticLibrary("shim_boost", ['shim_boost.cpp'],
- SYSLIBDEPS=[
- env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'],
- env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'],
- env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'],
- env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP']
- ] )
+ env.Library("shim_boost", ['shim_boost.cpp'],
+ SYSLIBDEPS=[
+ env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'],
+ env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'],
+ env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'],
+ env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP']
+ ] )
else:
env.SConscript('boost/SConscript')
- env.StaticLibrary( "shim_boost", ['shim_boost.cpp'],
- LIBDEPS=[ 'boost/boost_program_options',
- 'boost/boost_filesystem',
- 'boost/boost_thread',
- 'boost/boost_system',
- ] )
+ env.Library( "shim_boost", ['shim_boost.cpp'],
+ LIBDEPS=[ 'boost/boost_program_options',
+ 'boost/boost_filesystem',
+ 'boost/boost_thread',
+ 'boost/boost_system',
+ ] )
if use_system_version_of_library("snappy"):
- env.StaticLibrary("shim_snappy", ['shim_snappy.cpp'],
- SYSLIBDEPS=[
- env['LIBDEPS_SNAPPY_SYSLIBDEP']
- ] )
+ env.Library("shim_snappy", ['shim_snappy.cpp'],
+ SYSLIBDEPS=[
+ env['LIBDEPS_SNAPPY_SYSLIBDEP']
+ ] )
else:
env.Append(CPPPATH='$BUILD_DIR/third_party/snappy')
env.SConscript('snappy/SConscript')
- env.StaticLibrary('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
+ env.Library('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
if usev8:
if use_system_version_of_library("v8"):
- env.StaticLibrary("shim_v8", ['shim_v8.cpp'], SYSLIBDEPS=[
+ env.Library("shim_v8", ['shim_v8.cpp'], SYSLIBDEPS=[
env['LIBDEPS_V8_SYSLIBDEP'] ])
else:
env.Append(CPPPATH='$BUILD_DIR/third_party/v8/include')
env.SConscript('v8/SConscript')
- env.StaticLibrary('shim_v8', ['shim_v8.cpp'], LIBDEPS=['v8/v8'])
+ env.Library('shim_v8', ['shim_v8.cpp'], LIBDEPS=['v8/v8'])
if (GetOption("allocator") != "tcmalloc"):
- env.StaticLibrary("shim_allocator", "shim_allocator.cpp")
+ env.Library("shim_allocator", "shim_allocator.cpp")
elif use_system_version_of_library("tcmalloc"):
- env.StaticLibrary("shim_allocator", "shim_allocator.cpp",
- SYSLIBDEPS=[
- env['LIBDEPS_TCMALLOC_SYSLIBDEP']
- ] )
+ env.Library("shim_allocator", "shim_allocator.cpp",
+ SYSLIBDEPS=[
+ env['LIBDEPS_TCMALLOC_SYSLIBDEP']
+ ] )
else:
env.SConscript('gperftools-2.0/SConscript')
- env.StaticLibrary('shim_allocator', 'shim_allocator.cpp',
+ env.Library('shim_allocator', 'shim_allocator.cpp',
LIBDEPS=['gperftools-2.0/tcmalloc_minimal'])
if use_system_version_of_library("stemmer"):
- env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
- SYSLIBDEPS=[
- env['LIBDEPS_STEMMER_SYSLIBDEP']
- ] )
+ env.Library("shim_stemmer", ['shim_stemmer.cpp'],
+ SYSLIBDEPS=[
+ env['LIBDEPS_STEMMER_SYSLIBDEP']
+ ] )
else:
env.SConscript('libstemmer_c/SConscript')
- env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
- LIBDEPS=['libstemmer_c/stemmer'])
+ env.Library("shim_stemmer", ['shim_stemmer.cpp'],
+ LIBDEPS=['libstemmer_c/stemmer'])
if use_system_version_of_library("yaml"):
- env.StaticLibrary("shim_yaml", ['shim_yaml.cpp'],
- SYSLIBDEPS=[
- env['LIBDEPS_YAML_SYSLIBDEP']
- ] )
+ env.Library("shim_yaml", ['shim_yaml.cpp'],
+ SYSLIBDEPS=[
+ env['LIBDEPS_YAML_SYSLIBDEP']
+ ] )
else:
env.Append(CPPPATH='$BUILD_DIR/third_party/yaml-cpp-0.5.1/include')
env.SConscript('yaml-cpp-0.5.1/SConscript')
- env.StaticLibrary("shim_yaml", ['shim_yaml.cpp'],
- LIBDEPS=['yaml-cpp-0.5.1/yaml'])
+ env.Library("shim_yaml", ['shim_yaml.cpp'],
+ LIBDEPS=['yaml-cpp-0.5.1/yaml'])
diff --git a/src/third_party/boost/SConscript b/src/third_party/boost/SConscript
index f087fb5fdd7..5789d9556f8 100644
--- a/src/third_party/boost/SConscript
+++ b/src/third_party/boost/SConscript
@@ -2,7 +2,7 @@
Import("env")
-env.StaticLibrary('boost_system', ['libs/system/src/error_code.cpp'])
+env.Library('boost_system', ['libs/system/src/error_code.cpp'])
boost_thread_source = dict(
posix=['libs/thread/src/pthread/once.cpp',
@@ -14,9 +14,9 @@ boost_thread_source = dict(
threadlib_env = env.Clone()
threadlib_env.Append(CPPDEFINES=['BOOST_THREAD_BUILD_LIB'])
-threadlib_env.StaticLibrary('boost_thread', boost_thread_source)
+threadlib_env.Library('boost_thread', boost_thread_source)
-env.StaticLibrary('boost_filesystem', [
+env.Library('boost_filesystem', [
'libs/filesystem/v2/src/v2_operations.cpp',
'libs/filesystem/v2/src/v2_path.cpp',
'libs/filesystem/v2/src/v2_portability.cpp',
@@ -30,7 +30,7 @@ env.StaticLibrary('boost_filesystem', [
'libs/filesystem/v3/src/windows_file_codecvt.cpp',
])
-env.StaticLibrary('boost_program_options', [
+env.Library('boost_program_options', [
'libs/program_options/src/cmdline.cpp',
'libs/program_options/src/config_file.cpp',
'libs/program_options/src/convert.cpp',
diff --git a/src/third_party/gperftools-2.0/SConscript b/src/third_party/gperftools-2.0/SConscript
index 514a2d19fe0..1f959e113ed 100644
--- a/src/third_party/gperftools-2.0/SConscript
+++ b/src/third_party/gperftools-2.0/SConscript
@@ -92,4 +92,4 @@ def removeIfPresent(lst, item):
for to_remove in ['-Werror', "-Wsign-compare","-Wall"]:
removeIfPresent(env['CCFLAGS'], to_remove)
-env.StaticLibrary('tcmalloc_minimal', files, SYSLIBDEPS=my_SYSLIBDEPS)
+env.Library('tcmalloc_minimal', files, SYSLIBDEPS=my_SYSLIBDEPS)
diff --git a/src/third_party/libstemmer_c/SConscript b/src/third_party/libstemmer_c/SConscript
index c026011c720..b9ce21e27be 100644
--- a/src/third_party/libstemmer_c/SConscript
+++ b/src/third_party/libstemmer_c/SConscript
@@ -43,4 +43,4 @@ stemmer_files = [
['src_c/stem_%s.c' % p for p in stemming_packages],
]
-env.StaticLibrary( "stemmer", stemmer_files )
+env.Library( "stemmer", stemmer_files )
diff --git a/src/third_party/murmurhash3/SConscript b/src/third_party/murmurhash3/SConscript
index 7ef456e90e2..daab692df41 100644
--- a/src/third_party/murmurhash3/SConscript
+++ b/src/third_party/murmurhash3/SConscript
@@ -1,2 +1,2 @@
Import("env")
-env.StaticLibrary("murmurhash3", ["MurmurHash3.cpp"])
+env.Library("murmurhash3", ["MurmurHash3.cpp"])
diff --git a/src/third_party/pcre-8.30/SConscript b/src/third_party/pcre-8.30/SConscript
index c7d67202a53..ea931d5cc81 100644
--- a/src/third_party/pcre-8.30/SConscript
+++ b/src/third_party/pcre-8.30/SConscript
@@ -5,7 +5,7 @@ Import( "env" )
env = env.Clone()
env.Append( CPPDEFINES=[ "HAVE_CONFIG_H" ] )
-env.StaticLibrary( "pcrecpp", [
+env.Library( "pcrecpp", [
# pcre
"pcre_byte_order.c",
"pcre_compile.c",
diff --git a/src/third_party/s2/base/SConscript b/src/third_party/s2/base/SConscript
index e208968a6a9..a1f4a4720e5 100755
--- a/src/third_party/s2/base/SConscript
+++ b/src/third_party/s2/base/SConscript
@@ -6,7 +6,7 @@ env = env.Clone()
env.Append(CCFLAGS=['-Isrc/third_party/s2'])
-env.StaticLibrary(
+env.Library(
"base",
[
"int128.cc",
diff --git a/src/third_party/s2/strings/SConscript b/src/third_party/s2/strings/SConscript
index 09ddba6f3a0..8ba95770af7 100755
--- a/src/third_party/s2/strings/SConscript
+++ b/src/third_party/s2/strings/SConscript
@@ -6,7 +6,7 @@ env = env.Clone()
env.Append(CCFLAGS=['-Isrc/third_party/s2'])
-env.StaticLibrary(
+env.Library(
"strings",
[
"split.cc",
diff --git a/src/third_party/s2/util/coding/SConscript b/src/third_party/s2/util/coding/SConscript
index 15f77f28ad3..9dbc03b4818 100755
--- a/src/third_party/s2/util/coding/SConscript
+++ b/src/third_party/s2/util/coding/SConscript
@@ -7,7 +7,7 @@ env = env.Clone()
env.Append(CCFLAGS=['-Isrc/third_party/s2'])
env.Append(CCFLAGS=['-Isrc/third_party/gflags-2.0/src'])
-env.StaticLibrary(
+env.Library(
"coding",
[
"coder.cc",
diff --git a/src/third_party/s2/util/math/SConscript b/src/third_party/s2/util/math/SConscript
index af51445de1d..e88c4898b60 100755
--- a/src/third_party/s2/util/math/SConscript
+++ b/src/third_party/s2/util/math/SConscript
@@ -11,7 +11,7 @@ if solaris:
# Enables declaration of isinf() on Solaris
env.Append(CPPDEFINES=['__C99FEATURES__'])
-env.StaticLibrary("math",
- [ "mathutil.cc",
- # "mathlimits.cc",
- ])
+env.Library("math",
+ [ "mathutil.cc",
+ # "mathlimits.cc",
+ ])
diff --git a/src/third_party/snappy/SConscript b/src/third_party/snappy/SConscript
index 0eb74878806..9a227a385e7 100644
--- a/src/third_party/snappy/SConscript
+++ b/src/third_party/snappy/SConscript
@@ -6,4 +6,4 @@ if not windows:
env = env.Clone()
env.Append(CCFLAGS=['-Wno-sign-compare', '-Wno-unused-function'])
-env.StaticLibrary('snappy', ['snappy.cc', 'snappy-sinksource.cc'])
+env.Library('snappy', ['snappy.cc', 'snappy-sinksource.cc'])
diff --git a/src/third_party/v8/SConscript b/src/third_party/v8/SConscript
index a464b5b942a..11dc7df3a68 100644
--- a/src/third_party/v8/SConscript
+++ b/src/third_party/v8/SConscript
@@ -389,4 +389,4 @@ library_files = [('src/'+s) for s in LIBRARY_FILES]
library_files.append('src/macros.py')
env.JS2C(['src/libraries.cc'], library_files, TYPE='CORE', COMPRESSION='off')
-env.StaticLibrary("v8", sources)
+env.Library("v8", sources)
View Lorry Controller Status