← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/third_party/SConscript

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/third_party/SConscript
1
1
# -*- mode: python -*-
2
2
 
3
 
Import( "env use_system_version_of_library windows" )
 
3
Import("env use_system_version_of_library windows darwin usesm usev8")
4
4
 
5
5
env.SConscript( [
6
6
        "murmurhash3/SConscript",
 
7
        "s2/SConscript",
7
8
        ] )
 
9
env.Append(CPPPATH='$BUILD_DIR/third_party/s2')
8
10
 
9
11
if use_system_version_of_library("pcre"):
10
12
    env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'],
32
34
    env.SConscript('snappy/SConscript')
33
35
    env.StaticLibrary('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
34
36
 
35
 
if use_system_version_of_library("sm"):
36
 
    env.StaticLibrary("shim_spidermonkey", ['shim_spidermonkey.cpp'], SYSLIBDEPS=['js'])
37
 
else:
38
 
    if windows:
39
 
        env.Append(CPPDEFINES=['XP_WIN'])
40
 
    else:
41
 
        env.Append(CPPDEFINES=['XP_UNIX'])
42
 
    env.Append(CPPPATH='$BUILD_DIR/third_party/js-1.7')
43
 
    env.SConscript('js-1.7/SConscript')
44
 
    env.StaticLibrary('shim_spidermonkey', ['shim_spidermonkey.cpp'], LIBDEPS=['js-1.7/js'])
 
37
if usesm:
 
38
    if use_system_version_of_library("sm"):
 
39
        env.StaticLibrary("shim_spidermonkey", ['shim_spidermonkey.cpp'], SYSLIBDEPS=['js'])
 
40
    else:
 
41
        if windows:
 
42
            env.Append(CPPDEFINES=['XP_WIN'])
 
43
        else:
 
44
            env.Append(CPPDEFINES=['XP_UNIX'])
 
45
        env.Append(CPPPATH='$BUILD_DIR/third_party/js-1.7')
 
46
        env.SConscript('js-1.7/SConscript')
 
47
        env.StaticLibrary('shim_spidermonkey', ['shim_spidermonkey.cpp'], LIBDEPS=['js-1.7/js'])
 
48
elif usev8:
 
49
    if use_system_version_of_library("v8"):
 
50
        env.StaticLibrary("shim_v8", ['shim_v8.cpp'], SYSLIBDEPS=['v8'])
 
51
    else:
 
52
        env.Append(CPPPATH='$BUILD_DIR/third_party/v8/include')
 
53
        env.SConscript('v8/SConscript')
 
54
        env.StaticLibrary('shim_v8', ['shim_v8.cpp'], LIBDEPS=['v8/v8'])
45
55
 
46
56
if (GetOption("allocator") != "tcmalloc") or use_system_version_of_library("tcmalloc"):
47
57
    env.StaticLibrary("shim_allocator", "shim_allocator.cpp")
49
59
    env.SConscript('gperftools-2.0/SConscript')
50
60
    env.StaticLibrary('shim_allocator', 'shim_allocator.cpp',
51
61
                      LIBDEPS=['gperftools-2.0/tcmalloc_minimal'])
 
62
 
 
63
env.SConscript('libstemmer_c/SConscript')