From 87371d58d5a92d0468290cfc91fb279c42509a4b Mon Sep 17 00:00:00 2001
From: Michael Kuhn <michael.kuhn@ovgu.de>
Date: Sat, 14 Oct 2023 11:38:00 +0200
Subject: libbson, mongo-c-driver: add 1.24.4 (#40518)
---
.../repos/builtin/packages/libbson/package.py | 1 +
.../builtin/packages/mongo-c-driver/package.py | 25 ++++++++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py
index f3382fe712..082c50a6ac 100644
--- a/var/spack/repos/builtin/packages/libbson/package.py
+++ b/var/spack/repos/builtin/packages/libbson/package.py
@@ -15,6 +15,7 @@ class Libbson(Package):
maintainers("michaelkuhn")
+ version("1.24.4", sha256="2f4a3e8943bfe3b8672c2053f88cf74acc8494dc98a45445f727901eee141544")
version("1.23.4", sha256="209406c91fcf7c63aa633179a0a6b1b36ba237fb77e0470fd81f7299a408e334")
version("1.23.3", sha256="c8f951d4f965d455f37ae2e10b72914736fc0f25c4ffc14afc3cbadd1a574ef6")
version("1.23.2", sha256="123c358827eea07cd76a31c40281bb1c81b6744f6587c96d0cf217be8b1234e3")
diff --git a/var/spack/repos/builtin/packages/mongo-c-driver/package.py b/var/spack/repos/builtin/packages/mongo-c-driver/package.py
index d36854c931..94c92d9c02 100644
--- a/var/spack/repos/builtin/packages/mongo-c-driver/package.py
+++ b/var/spack/repos/builtin/packages/mongo-c-driver/package.py
@@ -14,6 +14,7 @@ class MongoCDriver(Package):
maintainers("michaelkuhn")
+ version("1.24.4", sha256="2f4a3e8943bfe3b8672c2053f88cf74acc8494dc98a45445f727901eee141544")
version("1.23.3", sha256="c8f951d4f965d455f37ae2e10b72914736fc0f25c4ffc14afc3cbadd1a574ef6")
version("1.21.0", sha256="840ff79480070f98870743fbb332e2c10dd021b6b9c952d08010efdda4d70ee4")
version("1.17.6", sha256="8644deec7ae585e8d12566978f2017181e883f303a028b5b3ccb83c91248b150")
@@ -52,14 +53,15 @@ class MongoCDriver(Package):
depends_on("pkgconfig", type="build")
# When updating mongo-c-driver, libbson has to be kept in sync.
- depends_on("libbson@1.23.0:1.23", when="@1.23")
- depends_on("libbson@1.21.0:1.21", when="@1.21")
- depends_on("libbson@1.17.0:1.17", when="@1.17")
- depends_on("libbson@1.16.0:1.16", when="@1.16")
- depends_on("libbson@1.9.0:1.9", when="@1.9")
- depends_on("libbson@1.8.0:1.8", when="@1.8")
- depends_on("libbson@1.7.0:1.7", when="@1.7")
- depends_on("libbson@1.6.0:1.6", when="@1.6")
+ depends_on("libbson@1.24", when="@1.24")
+ depends_on("libbson@1.23", when="@1.23")
+ depends_on("libbson@1.21", when="@1.21")
+ depends_on("libbson@1.17", when="@1.17")
+ depends_on("libbson@1.16", when="@1.16")
+ depends_on("libbson@1.9", when="@1.9")
+ depends_on("libbson@1.8", when="@1.8")
+ depends_on("libbson@1.7", when="@1.7")
+ depends_on("libbson@1.6", when="@1.6")
depends_on("openssl", when="+ssl")
depends_on("snappy", when="+snappy")
@@ -69,7 +71,12 @@ class MongoCDriver(Package):
def cmake_args(self):
spec = self.spec
- args = ["-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF", "-DENABLE_BSON=SYSTEM"]
+ args = ["-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF"]
+
+ if spec.satisfies("@1.24:"):
+ args.append("-DUSE_SYSTEM_LIBBSON=ON")
+ else:
+ args.append("-DENABLE_BSON=SYSTEM")
if "+ssl" in spec:
args.append("-DENABLE_SSL=OPENSSL")
--
cgit v1.2.3-70-g09d2