From 93bca2f3a27e377d1c3f69311f8ade99a2cd0ac3 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 14 Nov 2017 17:21:05 +0100 Subject: [PATCH] libbson, libmongoc: Update to 1.8.1 (#6290) --- var/spack/repos/builtin/packages/libbson/package.py | 1 + var/spack/repos/builtin/packages/libmongoc/package.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 39a606cf73..d33ad3a430 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -32,6 +32,7 @@ class Libbson(AutotoolsPackage): homepage = "https://github.com/mongodb/libbson" url = "https://github.com/mongodb/libbson/releases/download/1.7.0/libbson-1.7.0.tar.gz" + version('1.8.1', '42601455cf7f450b46f62c4e6115c440') version('1.8.0', '8b3c64570eec721f951831958e707a5a') version('1.7.0', 'e196ad77dd8458ebc1166e6135030b63') version('1.6.3', 'b7bdb314197106fcfb4af105a582d343') diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 5050dd0336..4d292937f7 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -31,6 +31,7 @@ class Libmongoc(AutotoolsPackage): homepage = "https://github.com/mongodb/mongo-c-driver" url = "https://github.com/mongodb/mongo-c-driver/releases/download/1.7.0/mongo-c-driver-1.7.0.tar.gz" + version('1.8.1', '52d54a4107a2da20c1a1b28bc1ff9d44') version('1.8.0', '8c271a16ff30f6d4f5e134f699f7360f') version('1.7.0', '21acf3584e92631422bc91e9e3cf4f76') version('1.6.3', '0193610cf1d98aae7008f272a1000972') @@ -61,12 +62,15 @@ def configure_args(self): args.append('--enable-ssl=no') if spec.satisfies('@1.7.0:'): - # --with-{snappy,zlib}=system are currently broken and cause - # configure to not find the dependencies. We still want to - # explicitly disable them when appropriate. + # --with-{snappy,zlib}=system are broken for versions < 1.8.1 if '+snappy' not in spec: args.append('--with-snappy=no') + elif spec.satisfies('@1.8.1:'): + args.append('--with-snappy=system') + if '+zlib' not in spec: args.append('--with-zlib=no') + elif spec.satisfies('@1.8.1:'): + args.append('--with-zlib=system') return args