diff options
Diffstat (limited to 'databases/mongodb80/files')
| -rw-r--r-- | databases/mongodb80/files/patch-SConstruct | 29 | ||||
| -rw-r--r-- | databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp | 8 |
2 files changed, 9 insertions, 28 deletions
diff --git a/databases/mongodb80/files/patch-SConstruct b/databases/mongodb80/files/patch-SConstruct index 375b9238a97a..6e039812b1a2 100644 --- a/databases/mongodb80/files/patch-SConstruct +++ b/databases/mongodb80/files/patch-SConstruct @@ -1,31 +1,6 @@ ---- SConstruct.orig 2024-07-22 19:17:33 UTC +--- SConstruct.orig 2025-07-07 23:12:17 UTC +++ SConstruct -@@ -25,7 +25,6 @@ import SCons.Script - - import SCons - import SCons.Script --from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics - from site_scons.mongo import build_profiles - - # This must be first, even before EnsureSConsVersion, if -@@ -1722,16 +1721,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n - del envDict - env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') - --# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. --# We should only register this function after env, env_vars and the parser have been properly initialized. --SConsToolingMetrics.register_metrics( -- utc_starttime=datetime.utcnow(), -- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), -- env_vars=env_vars, -- env=env, -- parser=_parser, --) -- - if get_option('build-metrics'): - env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' - env.Tool('build_metrics') -@@ -1835,7 +1824,7 @@ if unknown_vars: +@@ -1848,7 +1848,7 @@ if unknown_vars: unknown_vars = env_vars.UnknownVariables() if unknown_vars: diff --git a/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp b/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp index e2c815567836..73e0befd876d 100644 --- a/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp +++ b/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp @@ -1,3 +1,9 @@ +# Original upstream implementation: +# https://jira.mongodb.org/browse/SERVER-81797 +# Attempt to upstream this patch: +# https://github.com/mongodb/mongo/pull/1607 +# https://jira.mongodb.org/browse/SERVER-99225 +# --- src/mongo/platform/waitable_atomic.cpp.orig 2024-11-20 23:53:48 UTC +++ src/mongo/platform/waitable_atomic.cpp @@ -34,6 +34,9 @@ @@ -46,7 +52,7 @@ + } + + int umtxOpRet; -+ if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) != 0) { ++ if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) == -1) { + if (errno == ETIMEDOUT) { + return false; + } |