Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mongodb34/files/patch-SConstruct
| --- SConstruct.orig 2017-04-20 21:43:42 UTC | --- SConstruct.orig 2017-06-08 16:11:03 UTC | ||||
| +++ SConstruct | +++ SConstruct | ||||
| @@ -929,9 +929,9 @@ if has_option('variables-help'): | @@ -929,9 +929,9 @@ if has_option('variables-help'): | ||||
| print env_vars.GenerateHelpText(env) | print env_vars.GenerateHelpText(env) | ||||
| Exit(0) | Exit(0) | ||||
| -unknown_vars = env_vars.UnknownVariables() | -unknown_vars = env_vars.UnknownVariables() | ||||
| -if unknown_vars: | -if unknown_vars: | ||||
| - env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) | - env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) | ||||
| ▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines | @@ -2461,7 +2461,7 @@ def doConfigure(myenv): | ||||
| }} | }} | ||||
| """.format(storage_class) | """.format(storage_class) | ||||
| context.Message('Checking for storage class {0} '.format(storage_class)) | context.Message('Checking for storage class {0} '.format(storage_class)) | ||||
| - ret = context.TryLink(textwrap.dedent(test_body), ".cpp") | - ret = context.TryLink(textwrap.dedent(test_body), ".cpp") | ||||
| + ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") | + ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") | ||||
| context.Result(ret) | context.Result(ret) | ||||
| return ret | return ret | ||||
| @@ -2645,6 +2645,7 @@ def doConfigure(myenv): | |||||
| conf = Configure(myenv, custom_tests = { | |||||
| 'CheckPThreadSetNameNP': CheckPThreadSetNameNP, | |||||
| + 'CheckBoostMinVersion': CheckBoostMinVersion, | |||||
| }) | |||||
| if conf.CheckPThreadSetNameNP(): | |||||