mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-16 20:21:58 +02:00
4aa1d4c173
Also fix build on armv5 Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
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/5] * Do not build 'mongo' binary when scripting is disabled
|
|
* Do not build the jstests when scripting is disabled
|
|
|
|
---
|
|
SConstruct | 8 ++++++--
|
|
src/mongo/SConscript | 4 +++-
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index 6e0ef3b..c84a669 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -440,10 +440,13 @@ else:
|
|
|
|
static = has_option( "static" )
|
|
|
|
-noshell = has_option( "noshell" )
|
|
-
|
|
disable_scripting = has_option( "disable-scripting" )
|
|
|
|
+if not disable_scripting:
|
|
+ noshell = has_option( "noshell" )
|
|
+else:
|
|
+ noshell = True
|
|
+
|
|
asio = has_option( "asio" )
|
|
|
|
usePCH = has_option( "usePCH" )
|
|
@@ -1662,6 +1665,7 @@ Export("get_option")
|
|
Export("has_option use_system_version_of_library")
|
|
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 58f8406..b4379e7 100644
|
|
--- a/src/mongo/SConscript
|
|
+++ b/src/mongo/SConscript
|
|
@@ -6,6 +6,7 @@ import os
|
|
import itertools
|
|
from buildscripts import utils
|
|
|
|
+Import("disable_scripting")
|
|
Import("env")
|
|
Import("shellEnv")
|
|
Import("testEnv")
|
|
@@ -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
|
|
- not str(f).endswith('framework_options_init.cpp') ],
|
|
+ not str(f).endswith('framework_options_init.cpp') and
|
|
+ not (str(f).endswith('jstests.cpp') and disable_scripting)],
|
|
LIBDEPS = [
|
|
"mutable_bson_test_utils",
|
|
"mongocommon",
|
|
--
|
|
1.9.0
|
|
|