|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: SConstruct
|
|
|
|
|
--- SConstruct.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ SConstruct 2018-04-16 19:47:32.282389000 +0200
|
|
|
|
|
@@ -539,7 +539,6 @@
|
|
|
|
|
--- SConstruct.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ SConstruct 2018-05-22 20:16:13.101090000 +0200
|
|
|
|
|
@@ -544,7 +544,6 @@
|
|
|
|
|
def variable_tools_converter(val):
|
|
|
|
|
tool_list = shlex.split(val)
|
|
|
|
|
return tool_list + [
|
|
|
|
@ -9,7 +9,7 @@ Index: SConstruct
|
|
|
|
|
"gziptool",
|
|
|
|
|
'idl_tool',
|
|
|
|
|
"jsheader",
|
|
|
|
|
@@ -922,9 +921,9 @@
|
|
|
|
|
@@ -930,9 +929,9 @@
|
|
|
|
|
print(env_vars.GenerateHelpText(env))
|
|
|
|
|
Exit(0)
|
|
|
|
|
|
|
|
|
@ -22,7 +22,7 @@ Index: SConstruct
|
|
|
|
|
|
|
|
|
|
def set_config_header_define(env, varname, varval = 1):
|
|
|
|
|
env['CONFIG_HEADER_DEFINES'][varname] = varval
|
|
|
|
|
@@ -1612,21 +1611,19 @@
|
|
|
|
|
@@ -1620,21 +1619,19 @@
|
|
|
|
|
# If runtime hardening is requested, then build anything
|
|
|
|
|
# destined for an executable with the necessary flags for PIE.
|
|
|
|
|
env.AppendUnique(
|
|
|
|
@ -46,7 +46,7 @@ Index: SConstruct
|
|
|
|
|
if not has_option("disable-warnings-as-errors"):
|
|
|
|
|
env.Append( CCFLAGS=["-Werror"] )
|
|
|
|
|
|
|
|
|
|
@@ -1662,19 +1659,10 @@
|
|
|
|
|
@@ -1670,19 +1667,10 @@
|
|
|
|
|
env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
|
|
|
|
|
|
|
|
|
|
if optBuild:
|
|
|
|
@ -67,7 +67,7 @@ Index: SConstruct
|
|
|
|
|
mmapv1 = False
|
|
|
|
|
if get_option('mmapv1') == 'auto':
|
|
|
|
|
# The mmapv1 storage engine is only supported on x86
|
|
|
|
|
@@ -2559,7 +2547,7 @@
|
|
|
|
|
@@ -2567,7 +2555,7 @@
|
|
|
|
|
}}
|
|
|
|
|
"""
|
|
|
|
|
context.Message('Checking for storage class thread_local ')
|
|
|
|
@ -76,7 +76,7 @@ Index: SConstruct
|
|
|
|
|
context.Result(ret)
|
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
@@ -3154,8 +3142,6 @@
|
|
|
|
|
@@ -3174,8 +3162,6 @@
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
@ -85,7 +85,7 @@ Index: SConstruct
|
|
|
|
|
env['SERVER_DIST_BASENAME'] = env.subst('mongodb-%s-$MONGO_DISTNAME' % (getSystemInstallName()))
|
|
|
|
|
|
|
|
|
|
module_sconscripts = moduleconfig.get_module_sconscripts(mongo_modules)
|
|
|
|
|
@@ -3197,17 +3183,9 @@
|
|
|
|
|
@@ -3217,17 +3203,9 @@
|
|
|
|
|
vcxprojFile = env.Command(
|
|
|
|
|
"mongodb.vcxproj",
|
|
|
|
|
compileCommands,
|
|
|
|
@ -104,18 +104,18 @@ Index: SConstruct
|
|
|
|
|
env.SConscript(
|
|
|
|
|
dirs=[
|
|
|
|
|
'src',
|
|
|
|
|
@@ -3219,7 +3197,7 @@
|
|
|
|
|
@@ -3239,7 +3217,7 @@
|
|
|
|
|
variant_dir='$BUILD_DIR',
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
-all = env.Alias('all', ['core', 'tools', 'dbtest', 'unittests', 'integration_tests'])
|
|
|
|
|
+all = env.Alias('all', ['core', 'tools' ])
|
|
|
|
|
-all = env.Alias('all', ['core', 'tools', 'dbtest', 'unittests', 'integration_tests', 'benchmarks'])
|
|
|
|
|
+all = env.Alias('all', ['core', 'tools'])
|
|
|
|
|
|
|
|
|
|
# run the Dagger tool if it's installed
|
|
|
|
|
if should_dagger:
|
|
|
|
|
Index: site_scons/site_tools/mongo_integrationtest.py
|
|
|
|
|
--- site_scons/site_tools/mongo_integrationtest.py.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ site_scons/site_tools/mongo_integrationtest.py 2018-04-16 19:47:32.282556000 +0200
|
|
|
|
|
--- site_scons/site_tools/mongo_integrationtest.py.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ site_scons/site_tools/mongo_integrationtest.py 2018-05-22 20:11:45.897048000 +0200
|
|
|
|
|
@@ -7,9 +7,7 @@
|
|
|
|
|
|
|
|
|
|
_integration_tests = []
|
|
|
|
@ -144,8 +144,8 @@ Index: site_scons/site_tools/mongo_integrationtest.py
|
|
|
|
|
def generate(env):
|
|
|
|
|
env.Command('$INTEGRATION_TEST_LIST', env.Value(_integration_tests),
|
|
|
|
|
Index: site_scons/site_tools/mongo_unittest.py
|
|
|
|
|
--- site_scons/site_tools/mongo_unittest.py.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ site_scons/site_tools/mongo_unittest.py 2018-04-16 19:47:32.282687000 +0200
|
|
|
|
|
--- site_scons/site_tools/mongo_unittest.py.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ site_scons/site_tools/mongo_unittest.py 2018-05-22 20:11:45.897225000 +0200
|
|
|
|
|
@@ -7,8 +7,7 @@
|
|
|
|
|
|
|
|
|
|
_unittests = []
|
|
|
|
@ -174,8 +174,8 @@ Index: site_scons/site_tools/mongo_unittest.py
|
|
|
|
|
def generate(env):
|
|
|
|
|
env.Command('$UNITTEST_LIST', env.Value(_unittests),
|
|
|
|
|
Index: src/mongo/SConscript
|
|
|
|
|
--- src/mongo/SConscript.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/SConscript 2018-04-16 19:47:32.282892000 +0200
|
|
|
|
|
--- src/mongo/SConscript.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/SConscript 2018-05-22 20:11:45.897515000 +0200
|
|
|
|
|
@@ -28,7 +28,6 @@
|
|
|
|
|
'dbtests',
|
|
|
|
|
'executor',
|
|
|
|
@ -185,8 +185,8 @@ Index: src/mongo/SConscript
|
|
|
|
|
'platform',
|
|
|
|
|
'rpc',
|
|
|
|
|
Index: src/mongo/crypto/SConscript
|
|
|
|
|
--- src/mongo/crypto/SConscript.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/crypto/SConscript 2018-04-16 19:47:32.283038000 +0200
|
|
|
|
|
--- src/mongo/crypto/SConscript.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/crypto/SConscript 2018-05-22 20:11:45.897714000 +0200
|
|
|
|
|
@@ -2,6 +2,10 @@
|
|
|
|
|
|
|
|
|
|
Import("env")
|
|
|
|
@ -225,8 +225,8 @@ Index: src/mongo/crypto/SConscript
|
|
|
|
|
env.Library('scramauth',
|
|
|
|
|
['mechanism_scram.cpp'],
|
|
|
|
|
Index: src/mongo/db/pipeline/document_source_bucket_auto.cpp
|
|
|
|
|
--- src/mongo/db/pipeline/document_source_bucket_auto.cpp.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/document_source_bucket_auto.cpp 2018-04-16 19:47:32.283281000 +0200
|
|
|
|
|
--- src/mongo/db/pipeline/document_source_bucket_auto.cpp.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/document_source_bucket_auto.cpp 2018-05-22 20:11:45.898039000 +0200
|
|
|
|
|
@@ -167,7 +167,7 @@
|
|
|
|
|
|
|
|
|
|
// Calculate the approximate bucket size. We attempt to fill each bucket with this many
|
|
|
|
@ -237,8 +237,8 @@ Index: src/mongo/db/pipeline/document_source_bucket_auto.cpp
|
|
|
|
|
if (approxBucketSize < 1) {
|
|
|
|
|
// If the number of buckets is larger than the number of documents, then we try to make as
|
|
|
|
|
Index: src/mongo/db/pipeline/expression.cpp
|
|
|
|
|
--- src/mongo/db/pipeline/expression.cpp.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/expression.cpp 2018-04-16 19:47:32.284025000 +0200
|
|
|
|
|
--- src/mongo/db/pipeline/expression.cpp.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/expression.cpp 2018-05-22 20:11:45.899049000 +0200
|
|
|
|
|
@@ -35,6 +35,7 @@
|
|
|
|
|
#include <boost/algorithm/string.hpp>
|
|
|
|
|
#include <cstdio>
|
|
|
|
@ -257,8 +257,8 @@ Index: src/mongo/db/pipeline/expression.cpp
|
|
|
|
|
return numericArg;
|
|
|
|
|
}
|
|
|
|
|
Index: src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp
|
|
|
|
|
--- src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp 2018-04-16 19:47:32.284279000 +0200
|
|
|
|
|
--- src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp 2018-05-22 20:11:45.899274000 +0200
|
|
|
|
|
@@ -67,7 +67,7 @@
|
|
|
|
|
|
|
|
|
|
Value exp;
|
|
|
|
@ -278,8 +278,8 @@ Index: src/mongo/db/pipeline/granularity_rounder_powers_of_two.cpp
|
|
|
|
|
Decimal128 input = value.getDecimal();
|
|
|
|
|
exp = Value(Decimal128(
|
|
|
|
|
Index: src/mongo/util/represent_as.h
|
|
|
|
|
--- src/mongo/util/represent_as.h.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/represent_as.h 2018-04-16 19:47:32.284512000 +0200
|
|
|
|
|
--- src/mongo/util/represent_as.h.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/represent_as.h 2018-05-22 20:11:45.899577000 +0200
|
|
|
|
|
@@ -202,7 +202,7 @@
|
|
|
|
|
// If Output is integral and number is a non-integral floating point value,
|
|
|
|
|
// return a disengaged optional.
|
|
|
|
@ -290,8 +290,8 @@ Index: src/mongo/util/represent_as.h
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Index: src/mongo/util/summation.h
|
|
|
|
|
--- src/mongo/util/summation.h.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/summation.h 2018-04-16 19:47:32.284644000 +0200
|
|
|
|
|
--- src/mongo/util/summation.h.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/summation.h 2018-05-22 20:11:45.899762000 +0200
|
|
|
|
|
@@ -104,7 +104,7 @@
|
|
|
|
|
* Returns whether the accumulated sum has a fractional part.
|
|
|
|
|
*/
|
|
|
|
@ -302,8 +302,8 @@ Index: src/mongo/util/summation.h
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
Index: src/mongo/util/time_support.cpp
|
|
|
|
|
--- src/mongo/util/time_support.cpp.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/time_support.cpp 2018-04-16 19:59:21.771541000 +0200
|
|
|
|
|
--- src/mongo/util/time_support.cpp.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/mongo/util/time_support.cpp 2018-05-22 20:11:45.900064000 +0200
|
|
|
|
|
@@ -933,7 +933,7 @@
|
|
|
|
|
// Find minimum timer resolution of OS
|
|
|
|
|
Nanoseconds getMinimumTimerResolution() {
|
|
|
|
@ -314,9 +314,9 @@ Index: src/mongo/util/time_support.cpp
|
|
|
|
|
clock_getres(CLOCK_REALTIME, &tp);
|
|
|
|
|
minTimerResolution = Nanoseconds{tp.tv_nsec};
|
|
|
|
|
Index: src/third_party/SConscript
|
|
|
|
|
--- src/third_party/SConscript.orig 2018-04-06 16:45:51.000000000 +0200
|
|
|
|
|
+++ src/third_party/SConscript 2018-04-16 19:47:32.284816000 +0200
|
|
|
|
|
@@ -122,8 +122,8 @@
|
|
|
|
|
--- src/third_party/SConscript.orig 2018-05-11 23:52:10.000000000 +0200
|
|
|
|
|
+++ src/third_party/SConscript 2018-05-22 20:11:45.900302000 +0200
|
|
|
|
|
@@ -127,8 +127,8 @@
|
|
|
|
|
if use_system_version_of_library("pcre"):
|
|
|
|
|
pcreEnv = env.Clone(
|
|
|
|
|
SYSLIBDEPS=[
|
|
|
|
|