diff options
Diffstat (limited to 'meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch')
-rw-r--r-- | meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch b/meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch index 5c314b189c..016ac3584b 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch +++ b/meta-oe/recipes-support/mongodb/mongodb/0003-Do-not-build-mongo-binary-when-scripting-is-disabled.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1f8e10747af3988e8ddee609bea990f622dd746a Mon Sep 17 00:00:00 2001 | 1 | From eab4316597a8e9e7bbf845a054564c6daa4a95b7 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Hudson-Doyle <michael.hudson@linaro.org> | 2 | From: Michael Hudson-Doyle <michael.hudson@linaro.org> |
3 | Date: Wed, 22 Jan 2014 13:53:10 +1300 | 3 | Date: Wed, 22 Jan 2014 13:53:10 +1300 |
4 | Subject: [PATCH 3/3] * Do not build 'mongo' binary when scripting is disabled | 4 | Subject: [PATCH 3/5] * Do not build 'mongo' binary when scripting is disabled |
5 | * Do not build the jstests when scripting is disabled | 5 | * Do not build the jstests when scripting is disabled |
6 | 6 | ||
7 | --- | 7 | --- |
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] * Do not build 'mongo' binary when scripting is disabled | |||
10 | 2 files changed, 9 insertions(+), 3 deletions(-) | 10 | 2 files changed, 9 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/SConstruct b/SConstruct | 12 | diff --git a/SConstruct b/SConstruct |
13 | index 1f14083..a69cf0a 100644 | 13 | index 6e0ef3b..c84a669 100644 |
14 | --- a/SConstruct | 14 | --- a/SConstruct |
15 | +++ b/SConstruct | 15 | +++ b/SConstruct |
16 | @@ -437,10 +437,13 @@ else: | 16 | @@ -440,10 +440,13 @@ else: |
17 | 17 | ||
18 | static = has_option( "static" ) | 18 | static = has_option( "static" ) |
19 | 19 | ||
@@ -29,16 +29,16 @@ index 1f14083..a69cf0a 100644 | |||
29 | asio = has_option( "asio" ) | 29 | asio = has_option( "asio" ) |
30 | 30 | ||
31 | usePCH = has_option( "usePCH" ) | 31 | usePCH = has_option( "usePCH" ) |
32 | @@ -1671,6 +1674,7 @@ Export("get_option") | 32 | @@ -1662,6 +1665,7 @@ Export("get_option") |
33 | Export("has_option use_system_version_of_library") | 33 | Export("has_option use_system_version_of_library") |
34 | Export("installSetup mongoCodeVersion") | 34 | Export("mongoCodeVersion") |
35 | Export("usev8") | 35 | Export("usev8") |
36 | +Export("disable_scripting") | 36 | +Export("disable_scripting") |
37 | Export("darwin windows solaris linux freebsd nix") | 37 | Export("darwin windows solaris linux freebsd nix") |
38 | Export('module_sconscripts') | 38 | Export('module_sconscripts') |
39 | Export("debugBuild optBuild") | 39 | Export("debugBuild optBuild") |
40 | diff --git a/src/mongo/SConscript b/src/mongo/SConscript | 40 | diff --git a/src/mongo/SConscript b/src/mongo/SConscript |
41 | index d84267e..dc0ca3a 100644 | 41 | index 58f8406..b4379e7 100644 |
42 | --- a/src/mongo/SConscript | 42 | --- a/src/mongo/SConscript |
43 | +++ b/src/mongo/SConscript | 43 | +++ b/src/mongo/SConscript |
44 | @@ -6,6 +6,7 @@ import os | 44 | @@ -6,6 +6,7 @@ import os |
@@ -49,7 +49,7 @@ index d84267e..dc0ca3a 100644 | |||
49 | Import("env") | 49 | Import("env") |
50 | Import("shellEnv") | 50 | Import("shellEnv") |
51 | Import("testEnv") | 51 | Import("testEnv") |
52 | @@ -1022,7 +1023,8 @@ test = testEnv.Install( | 52 | @@ -1043,7 +1044,8 @@ test = testEnv.Install( |
53 | [ f for f in Glob("dbtests/*.cpp") | 53 | [ f for f in Glob("dbtests/*.cpp") |
54 | if not str(f).endswith('framework.cpp') and | 54 | if not str(f).endswith('framework.cpp') and |
55 | not str(f).endswith('framework_options.cpp') and | 55 | not str(f).endswith('framework_options.cpp') and |
@@ -60,5 +60,5 @@ index d84267e..dc0ca3a 100644 | |||
60 | "mutable_bson_test_utils", | 60 | "mutable_bson_test_utils", |
61 | "mongocommon", | 61 | "mongocommon", |
62 | -- | 62 | -- |
63 | 1.8.4.2 | 63 | 1.9.0 |
64 | 64 | ||