Skip to content

Commit 502ca04

Browse files
committed
CXX-1523 Bump C driver minimums to 1.7.0
1 parent 77bd523 commit 502ca04

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

.evergreen/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ echo "About to install $LIB ($VERSION) into $PREFIX configured with '$CONFIGURE_
4444
if [ "${VERSION}" = "master" ]; then
4545
rm -rf $LIB
4646
# Must be http as rhel55 has https issues
47-
curl -o $LIB.tgz -L http://s3.amazonaws.com/mciuploads/$LIB/$LIB-latest.tar.gz
47+
curl -o $LIB.tgz -L http://s3.amazonaws.com/mciuploads/$LIB/$VERSION/$LIB-latest.tar.gz
48+
4849
tar --extract --file $LIB.tgz
4950
rm -rf $LIB
5051
DIR=$(echo $LIB-*)

.mci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ variables:
4747

4848
## cmake flag variables
4949
cmake_flags:
50-
linux_cmake_flags: &linux_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -Wno-error=missing-field-initializers"
51-
rhel55_cmake_flags: &rhel55_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror"
52-
osx_cmake_flags: &osx_cmake_flags -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wall -Wextra -Werror" -DBSONCXX_POLY_USE_BOOST=ON
53-
asan_cmake_flags: &asan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=address -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror"
54-
ubsan_cmake_flags: &ubsan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=undefined -fsanitize-blacklist=$(pwd)/../etc/ubsan.blacklist -fno-sanitize-recover=undefined -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror"
50+
linux_cmake_flags: &linux_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -Wno-error=deprecated-declarations -Wno-error=missing-field-initializers"
51+
rhel55_cmake_flags: &rhel55_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -Wno-error=deprecated-declarations"
52+
osx_cmake_flags: &osx_cmake_flags -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wall -Wextra -Werror -Wno-error=deprecated-declarations" -DBSONCXX_POLY_USE_BOOST=ON
53+
asan_cmake_flags: &asan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=address -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror -Wno-error=deprecated-declarations"
54+
ubsan_cmake_flags: &ubsan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=undefined -fsanitize-blacklist=$(pwd)/../etc/ubsan.blacklist -fno-sanitize-recover=undefined -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror -Wno-error=deprecated-declarations"
5555

5656
## test parameters
5757
test_params:
@@ -137,7 +137,7 @@ functions:
137137
if [ "${cc_path|default}" != "default" ]; then
138138
export CC="${cc_path}"
139139
fi
140-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ${cmake_path} ${cmake_flags} -DCMAKE_BUILD_TYPE=${build_type} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_FLAGS="-Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers" ..
140+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ${cmake_path} ${cmake_flags} -DCMAKE_BUILD_TYPE=${build_type} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_FLAGS="-Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers -Wno-error=deprecated-declarations" ..
141141
make ${compile_concurrency} all
142142
make install
143143
make ${compile_concurrency} examples
@@ -189,7 +189,7 @@ tasks:
189189
commands:
190190
- func: "install_c_driver"
191191
vars:
192-
MONGOC_VERSION: 1.5.0
192+
MONGOC_VERSION: 1.7.0
193193
- func: "compile"
194194
- func: "test"
195195

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ install:
6262
- pushd mongo-c-driver
6363

6464
# Check out the the minimum C driver version for this branch
65-
- git checkout 1.5.0
65+
- git checkout 1.7.0
6666

6767
- ./autogen.sh --enable-tests=no --enable-examples=no --with-libbson=bundled; make; sudo make install
6868

docs/content/mongocxx-v3/installation.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ The mongocxx driver builds on top of the MongoDB C driver.
2424

2525
* For mongocxx-3.0.x, we recommend the latest stable version of libmongoc
2626
(currently version 1.5.0 at the time this page was written).
27-
* For mongocxx-3.1.0 release candidates, libmongoc 1.5.0 or later is
27+
* For mongocxx-3.1.0-3, libmongoc 1.5.0 or later is
28+
required.
29+
* For mongocxx-3.1.4+, libmongoc 1.7.0 or later is
2830
required.
2931

3032
Unless you know that your package manager offers a high-enough version, you

src/bsoncxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ set(BSONCXX_VERSION ${BSONCXX_VERSION_MAJOR}.${BSONCXX_VERSION_MINOR}.${BSONCXX_
6262
set(BSONCXX_INLINE_NAMESPACE "v${BSONCXX_ABI_VERSION}")
6363
set(BSONCXX_HEADER_INSTALL_DIR "include/bsoncxx/${BSONCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
6464

65-
set(LIBBSON_REQUIRED_VERSION 1.5.0)
65+
set(LIBBSON_REQUIRED_VERSION 1.7.0)
6666
set(LIBBSON_REQUIRED_ABI_VERSION 1.0)
6767
find_package(LibBSON ${LIBBSON_REQUIRED_VERSION} REQUIRED)
6868

src/mongocxx/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
project(MONGOCXX)
1616

17-
set(LIBBSON_REQUIRED_VERSION 1.5.0)
17+
set(LIBBSON_REQUIRED_VERSION 1.7.0)
1818
set(LIBBSON_REQUIRED_ABI_VERSION 1.0)
1919
find_package(LibBSON ${LIBBSON_REQUIRED_VERSION} REQUIRED)
2020

21-
set(LIBMONGOC_REQUIRED_VERSION 1.5.0)
21+
set(LIBMONGOC_REQUIRED_VERSION 1.7.0)
2222
set(LIBMONGOC_REQUIRED_ABI_VERSION 1.0)
2323
find_package(LibMongoC ${LIBMONGOC_REQUIRED_VERSION} REQUIRED)
2424

0 commit comments

Comments
 (0)