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 @@ -From 1f8e10747af3988e8ddee609bea990f622dd746a Mon Sep 17 00:00:00 2001 +From eab4316597a8e9e7bbf845a054564c6daa4a95b7 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle <michael.hudson@linaro.org> Date: Wed, 22 Jan 2014 13:53:10 +1300 -Subject: [PATCH 3/3] * Do not build 'mongo' binary when scripting is disabled +Subject: [PATCH 3/5] * Do not build 'mongo' binary when scripting is disabled * Do not build the jstests when scripting is disabled --- @@ -10,10 +10,10 @@ Subject: [PATCH 3/3] * Do not build 'mongo' binary when scripting is disabled 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct -index 1f14083..a69cf0a 100644 +index 6e0ef3b..c84a669 100644 --- a/SConstruct +++ b/SConstruct -@@ -437,10 +437,13 @@ else: +@@ -440,10 +440,13 @@ else: static = has_option( "static" ) @@ -29,16 +29,16 @@ index 1f14083..a69cf0a 100644 asio = has_option( "asio" ) usePCH = has_option( "usePCH" ) -@@ -1671,6 +1674,7 @@ Export("get_option") +@@ -1662,6 +1665,7 @@ Export("get_option") Export("has_option use_system_version_of_library") - Export("installSetup mongoCodeVersion") + Export("mongoCodeVersion") Export("usev8") +Export("disable_scripting") Export("darwin windows solaris linux freebsd nix") Export('module_sconscripts') Export("debugBuild optBuild") diff --git a/src/mongo/SConscript b/src/mongo/SConscript -index d84267e..dc0ca3a 100644 +index 58f8406..b4379e7 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -6,6 +6,7 @@ import os @@ -49,7 +49,7 @@ index d84267e..dc0ca3a 100644 Import("env") Import("shellEnv") Import("testEnv") -@@ -1022,7 +1023,8 @@ test = testEnv.Install( +@@ -1043,7 +1044,8 @@ test = testEnv.Install( [ f for f in Glob("dbtests/*.cpp") if not str(f).endswith('framework.cpp') and not str(f).endswith('framework_options.cpp') and @@ -60,5 +60,5 @@ index d84267e..dc0ca3a 100644 "mutable_bson_test_utils", "mongocommon", -- -1.8.4.2 +1.9.0 |