diff options
Diffstat (limited to 'databases/mongodb44/files/patch-SConstruct')
| -rw-r--r-- | databases/mongodb44/files/patch-SConstruct | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/databases/mongodb44/files/patch-SConstruct b/databases/mongodb44/files/patch-SConstruct index 9fc72edebc07..4d4576d66465 100644 --- a/databases/mongodb44/files/patch-SConstruct +++ b/databases/mongodb44/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2021-07-07 09:17:06 UTC +--- SConstruct.orig 2023-05-10 02:21:42 UTC +++ SConstruct -@@ -1213,9 +1213,9 @@ if has_option('variables-help'): +@@ -1269,9 +1269,9 @@ if has_option('variables-help'): print(env_vars.GenerateHelpText(env)) Exit(0) @@ -11,9 +11,9 @@ +#if unknown_vars: +# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) - if get_option('install-action') != 'default' and get_option('ninja') != "disabled": - env.FatalError("Cannot use non-default install actions when generating Ninja.") -@@ -2091,7 +2091,7 @@ if env.TargetOSIs('posix'): + install_actions.setup(env, get_option('install-action')) + +@@ -2196,7 +2196,7 @@ if env.TargetOSIs('posix'): # If runtime hardening is requested, then build anything # destined for an executable with the necessary flags for PIE. env.AppendUnique( @@ -22,7 +22,7 @@ PROGLINKFLAGS=['-pie'], ) -@@ -2106,7 +2106,7 @@ if env.TargetOSIs('posix'): +@@ -2211,7 +2211,7 @@ if env.TargetOSIs('posix'): "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet @@ -31,3 +31,12 @@ if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) +@@ -2297,7 +2297,7 @@ if env.ToolchainIs('GCC', 'clang'): + elif env['TARGET_ARCH'] == 'aarch64': + # If we are using GCC or clang to target aarch64, set the arch to be armv8.2-a, + # This is to prevent a bug with WT see SERVER-71772 for more details +- env.Append( CCFLAGS=['-march=armv8.2-a', '-mtune=generic'] ) ++ env.Append( CCFLAGS=['-march=armv8-a+crc', '-mtune=generic'] ) + + # Needed for auth tests since key files are stored in git with mode 644. + if not env.TargetOSIs('windows'): |