[dev-db/mongodb] bump 7

This commit is contained in:
2025-04-14 22:14:38 +02:00
parent 9bcea35893
commit 7c5d982f3f
4 changed files with 16 additions and 13 deletions

View File

@@ -147,13 +147,3 @@ index 92d557b..80ee9e8 100644
if use_system_version_of_library("boost"):
if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"):
myenv.ConfError("can't find boost headers")
@@ -5327,6 +5252,9 @@ def doConfigure(myenv):
mongoc_mode = get_option('use-system-mongo-c')
conf.env['MONGO_HAVE_LIBMONGOC'] = False
+ conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags')
+ conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0'
+
if mongoc_mode != 'off':
if conf.CheckLibWithHeader(
["mongoc-1.0"],

View File

@@ -0,0 +1,12 @@
diff -u -r a/src/mongo/util/pcre.h b/src/mongo/util/pcre.h
--- a/src/mongo/util/pcre.h 2025-03-02 16:46:18.443355487 -0500
+++ b/src/mongo/util/pcre.h 2025-03-02 16:46:59.651708274 -0500
@@ -155,7 +155,7 @@
X(ERROR_ALPHA_ASSERTION_UNKNOWN) \
X(ERROR_SCRIPT_RUN_NOT_AVAILABLE) \
X(ERROR_TOO_MANY_CAPTURES) \
- X(ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED) \
+ /*X(ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED)*/ \
X(ERROR_BACKSLASH_K_IN_LOOKAROUND) \
X(ERROR_NOMATCH) \
X(ERROR_PARTIAL) \