Changeset View
Changeset View
Standalone View
Standalone View
databases/mongodb60/files/patch-SConstruct
| --- SConstruct.orig 2021-07-15 20:56:31 UTC | --- SConstruct.orig 2022-08-05 16:21:29 UTC | ||||
| +++ SConstruct | +++ SConstruct | ||||
| @@ -1328,9 +1328,9 @@ if has_option('variables-help'): | @@ -1342,9 +1342,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(list(unknown_vars.keys()))) | - env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) | ||||
| +#unknown_vars = env_vars.UnknownVariables() | +#unknown_vars = env_vars.UnknownVariables() | ||||
| +#if unknown_vars: | +#if unknown_vars: | ||||
| +# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) | +# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) | ||||
| if get_option('install-action') != 'default' and get_option('ninja') != "disabled": | if get_option('install-action') != 'default' and get_option('ninja') != "disabled": | ||||
| env.FatalError("Cannot use non-default install actions when generating Ninja.") | env.FatalError("Cannot use non-default install actions when generating Ninja.") | ||||
| @@ -2507,7 +2507,7 @@ if env.TargetOSIs('posix'): | @@ -2427,13 +2427,12 @@ if env.TargetOSIs('posix'): | ||||
| # If runtime hardening is requested, then build anything | # If runtime hardening is requested, then build anything | ||||
| # destined for an executable with the necessary flags for PIE. | # destined for an executable with the necessary flags for PIE. | ||||
| env.AppendUnique( | env.AppendUnique( | ||||
| - PROGCCFLAGS=['-fPIE'], | - PROGCCFLAGS=['-fPIE'], | ||||
| + PROGCCFLAGS=['-fpic'], | + PROGCCFLAGS=['-fpic'], | ||||
| PROGLINKFLAGS=['-pie'], | PROGLINKFLAGS=['-pie'], | ||||
| ) | ) | ||||
| @@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too | # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. | ||||
| env.Append( CCFLAGS=["-fasynchronous-unwind-tables", | |||||
| - "-ggdb" if not env.TargetOSIs('emscripten') else "-g", | |||||
| "-Wall", | |||||
| "-Wsign-compare", | |||||
| "-Wno-unknown-pragmas", | |||||
| @@ -2600,8 +2599,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too | |||||
| # setting it for both C and C++ by setting both of CFLAGS and | # setting it for both C and C++ by setting both of CFLAGS and | ||||
| # CXXFLAGS. | # CXXFLAGS. | ||||
| + arm_march_flag = "armv8-a" | + arm_march_flag = "armv8-a" | ||||
| + if get_option('use-hardware-crc32') == "on": | + if get_option('use-hardware-crc32') == "on": | ||||
| + arm_march_flag += "+crc" | + arm_march_flag += "+crc" | ||||
| + | + | ||||
| default_targeting_flags_for_architecture = { | default_targeting_flags_for_architecture = { | ||||
| - "aarch64" : { "-march=" : "armv8.2-a", "-mtune=" : "generic" }, | - "aarch64" : { "-march=" : "armv8.2-a", "-mtune=" : "generic" }, | ||||
| + "aarch64" : { "-march=" : arm_march_flag, "-mtune=" : "generic" }, | + "aarch64" : { "-march=" : arm_march_flag, "-mtune=" : "generic" }, | ||||
| "i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, | "i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, | ||||
| "ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, | "ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, | ||||
| "s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, | "s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, | ||||