summaryrefslogtreecommitdiff
path: root/databases/mongodb70/files/patch-SConstruct
diff options
context:
space:
mode:
authorRonald Klop <ronald@FreeBSD.org>2023-06-09 13:32:28 +0200
committerRonald Klop <ronald@FreeBSD.org>2023-06-09 13:34:43 +0200
commitbe053ac53fd5068f7c2ac260566b40b2ecb483ad (patch)
treef4f51e3b764d9e7b17ff57791f4c0d0d950861dd /databases/mongodb70/files/patch-SConstruct
parentwww/envoy: the port had been updated to version 1.26.1 \o/ (diff)
databases/mongodb70: update to 7.0.0 RC3
Still Release Candidate status. Read the notes: https://www.mongodb.com/docs/v7.0/release-notes/7.0/ I had no time to test fixes for FreeBSD 14 yet. So 14 is broken still.
Diffstat (limited to 'databases/mongodb70/files/patch-SConstruct')
-rw-r--r--databases/mongodb70/files/patch-SConstruct67
1 files changed, 20 insertions, 47 deletions
diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct
index 1a7673bdce1c..b5998fcb4a52 100644
--- a/databases/mongodb70/files/patch-SConstruct
+++ b/databases/mongodb70/files/patch-SConstruct
@@ -1,58 +1,31 @@
---- SConstruct.orig 2023-04-24 16:15:19 UTC
+--- SConstruct.orig 2023-06-07 17:07:38 UTC
+++ SConstruct
-@@ -23,9 +23,9 @@ import SCons.Script
+@@ -23,7 +23,6 @@ import SCons.Script
import SCons
import SCons.Script
--from mongo_tooling_metrics.client import get_mongo_metrics_client
--from mongo_tooling_metrics.errors import ExternalHostException
-from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
-+#from mongo_tooling_metrics.client import get_mongo_metrics_client
-+#from mongo_tooling_metrics.errors import ExternalHostException
-+#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
-@@ -1659,22 +1659,22 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n
-
- # 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.
--try:
-- metrics_client = get_mongo_metrics_client()
-- metrics_client.register_metrics(
-- SConsToolingMetrics,
-- utc_starttime=datetime.utcnow(),
-- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-- env_vars=env_vars,
-- env=env,
-- parser=_parser,
-- )
--except ExternalHostException as _:
-- pass
--except Exception as _:
-- print(
-- "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform"
-- )
-+#try:
-+# metrics_client = get_mongo_metrics_client()
-+# metrics_client.register_metrics(
-+# SConsToolingMetrics,
-+# utc_starttime=datetime.utcnow(),
-+# artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-+# env_vars=env_vars,
-+# env=env,
-+# parser=_parser,
-+# )
-+#except ExternalHostException as _:
-+# pass
-+#except Exception as _:
-+# print(
-+# "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform"
-+# )
+@@ -1655,16 +1654,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'
-@@ -1812,9 +1812,9 @@ if has_option('variables-help'):
+ env.Tool('build_metrics')
+@@ -1801,9 +1790,9 @@ if has_option('variables-help'):
print(env_vars.GenerateHelpText(env))
Exit(0)
@@ -65,7 +38,7 @@
install_actions.setup(env, get_option('install-action'))
-@@ -3033,7 +3033,7 @@ if env.TargetOSIs('posix'):
+@@ -3026,7 +3015,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(
@@ -74,7 +47,7 @@
PROGLINKFLAGS=['-pie'],
)
-@@ -3041,7 +3041,6 @@ if env.TargetOSIs('posix'):
+@@ -3034,7 +3023,6 @@ if env.TargetOSIs('posix'):
env.Append(
CCFLAGS=[
"-fasynchronous-unwind-tables",
@@ -82,7 +55,7 @@
"-Wall",
"-Wsign-compare",
"-Wno-unknown-pragmas",
-@@ -3224,8 +3223,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
# setting it for both C and C++ by setting both of CFLAGS and
# CXXFLAGS.