Skip to content

Commit be728db

Browse files
authored
Bump libmongoc to 1.26-dev (#1511)
This pulls in CDRIVER-4754, which is needed for PHPLIB-1297
1 parent 99c632b commit be728db

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.evergreen/config/generated/build/build-libmongoc-8.2.yml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/templates/build/build-libmongoc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks:
1111
- func: "compile driver"
1212
vars:
1313
PHP_VERSION: "%phpVersion%"
14-
LIBMONGOC_VERSION: "1.25.2"
14+
LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2"
1515
- func: "upload build"
1616

1717
- name: "build-php-%phpVersion%-libmongoc-next-stable"
@@ -20,7 +20,8 @@ tasks:
2020
- func: "compile driver"
2121
vars:
2222
PHP_VERSION: "%phpVersion%"
23-
LIBMONGOC_VERSION: "r1.25"
23+
# TODO: change to r1.26 once 1.26.0 is released
24+
LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2"
2425
- func: "upload build"
2526

2627
- name: "build-php-%phpVersion%-libmongoc-latest"

config.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,26 +270,26 @@ if test "$PHP_MONGODB" != "no"; then
270270
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
271271

272272
if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
273-
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.25.2], [
273+
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.26.0], [
274274
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
275275
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
276276
277277
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
278278
PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
279279
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
280280
],[
281-
AC_MSG_ERROR([Could not find system library for libbson >= 1.25.2])
281+
AC_MSG_ERROR([Could not find system library for libbson >= 1.26.0])
282282
])
283283

284-
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.2], [
284+
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.26.0], [
285285
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
286286
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
287287
288288
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
289289
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
290290
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
291291
],[
292-
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.25.2)
292+
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.26.0)
293293
])
294294

295295
if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then

src/libmongoc

Submodule libmongoc updated 159 files

0 commit comments

Comments
 (0)