From 2b7370d1c0d98f4b3a8da24c313e22640a966897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:56:00 -0400 Subject: [PATCH] [mongo-cxx-driver] Update port to v3.8.0 (#33209) * [libbjson] update port to v1.24.3 * update version * [libbson] add patch * update version * [mongo-c-driver] update port to v1.24.3 * update hash * [mongo-cxx-driver] update port to r3.8.0 * update hash --- .../libbson/disable-dynamic-when-static.patch | 24 ++++++++--------- ports/libbson/fix-missing-header.patch | 12 +++++++++ ports/libbson/portfile.cmake | 3 ++- ports/libbson/vcpkg.json | 2 +- .../disable-dynamic-when-static.patch | 26 +++++++++---------- ports/mongo-c-driver/fix-dependencies.patch | 10 +++---- ports/mongo-c-driver/portfile.cmake | 4 +-- ports/mongo-c-driver/vcpkg.json | 2 +- ports/mongo-cxx-driver/fix-dependencies.patch | 8 +++--- ports/mongo-cxx-driver/portfile.cmake | 2 +- ports/mongo-cxx-driver/vcpkg.json | 2 +- versions/baseline.json | 6 ++--- versions/l-/libbson.json | 5 ++++ versions/m-/mongo-c-driver.json | 5 ++++ versions/m-/mongo-cxx-driver.json | 5 ++++ 15 files changed, 72 insertions(+), 44 deletions(-) create mode 100644 ports/libbson/fix-missing-header.patch diff --git a/ports/libbson/disable-dynamic-when-static.patch b/ports/libbson/disable-dynamic-when-static.patch index 58942b05d6..4bf375b05c 100644 --- a/ports/libbson/disable-dynamic-when-static.patch +++ b/ports/libbson/disable-dynamic-when-static.patch @@ -1,36 +1,36 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index d6df66f..88de79a 100644 +index 61e926747..6b4c5a911 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -209,6 +209,7 @@ set (HEADERS_FORWARDING +@@ -205,6 +205,7 @@ set (HEADERS_FORWARDING ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h ) - + +if(NOT MONGOC_ENABLE_STATIC_BUILD) add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - set (CMAKE_CXX_VISIBILITY_PRESET hidden) - target_compile_definitions (bson_shared -@@ -275,6 +276,7 @@ if (WIN32) + if (MSVC AND MSVC_VERSION VERSION_LESS 1900) + message (STATUS "Disabling warning C4756 for VS 2013 and older") +@@ -282,6 +283,7 @@ if (WIN32) # must be handled specially since we can't resolve them set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) endif () +endif() - + if (MONGOC_ENABLE_STATIC_BUILD) add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -349,7 +351,7 @@ set (BSON_HEADER_INSTALL_DIR +@@ -367,7 +369,7 @@ set (BSON_HEADER_INSTALL_DIR ) - + if (MONGOC_ENABLE_STATIC_INSTALL) - set (TARGETS_TO_INSTALL bson_shared bson_static) + set (TARGETS_TO_INSTALL bson_static) else () set (TARGETS_TO_INSTALL bson_shared) endif () -@@ -400,12 +402,14 @@ configure_file ( +@@ -418,12 +420,14 @@ configure_file ( ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc @ONLY) - + +if(NOT MONGOC_ENABLE_STATIC_INSTALL) install ( FILES @@ -39,6 +39,6 @@ index d6df66f..88de79a 100644 ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +endif() - + if (MONGOC_ENABLE_STATIC_INSTALL) configure_file ( diff --git a/ports/libbson/fix-missing-header.patch b/ports/libbson/fix-missing-header.patch new file mode 100644 index 0000000000..eee0e1907b --- /dev/null +++ b/ports/libbson/fix-missing-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index 61e926747..715b304c0 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -181,6 +181,7 @@ set (HEADERS + ${PROJECT_SOURCE_DIR}/src/bson/bson-compat.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-context.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-decimal128.h ++ ${PROJECT_SOURCE_DIR}/src/bson/bson-dsl.h # mongo-c-driver build time only + ${PROJECT_SOURCE_DIR}/src/bson/bson-endian.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-error.h + ${PROJECT_SOURCE_DIR}/src/bson/bson.h diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index e83f51079e..38341d152e 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,11 +6,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e + SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 HEAD_REF master PATCHES disable-dynamic-when-static.patch fix-include-directory.patch # vcpkg legacy decision + fix-missing-header.patch # for building mongo-c-driver ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index d83d179c06..ba4d23c8a9 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libbson", - "version": "1.22.2", + "version": "1.24.3", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/mongo-c-driver/disable-dynamic-when-static.patch b/ports/mongo-c-driver/disable-dynamic-when-static.patch index 4b6e5a462c..4404dfcad4 100644 --- a/ports/mongo-c-driver/disable-dynamic-when-static.patch +++ b/ports/mongo-c-driver/disable-dynamic-when-static.patch @@ -1,36 +1,36 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 7fcdd86..1b32e6c 100644 +index bf95bd0c1..c9900b7fa 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -758,6 +758,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) - endif() +@@ -745,6 +745,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) + set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") endif () - + +if (NOT MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -796,7 +797,7 @@ target_include_directories ( +@@ -786,7 +787,7 @@ target_include_directories ( set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") - + -if (MONGOC_ENABLE_STATIC_BUILD) -+else () ++else() add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES}) - if (NOT WIN32 AND ENABLE_PIC) -@@ -847,7 +848,11 @@ if (ENABLE_APPLE_FRAMEWORK) + if(ENABLE_COVERAGE) + target_compile_options(mongoc_static PRIVATE --coverage) +@@ -840,7 +841,11 @@ if (ENABLE_APPLE_FRAMEWORK) endif () - + add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) +if (NOT MONGOC_ENABLE_STATIC_BUILD) target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +else() +target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) +endif() - + # mongoc-stat works if shared memory performance counters are enabled. - if (ENABLE_SHM_COUNTERS STREQUAL "ON") + if (ENABLE_SHM_COUNTERS) @@ -1161,7 +1166,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) diff --git a/ports/mongo-c-driver/fix-dependencies.patch b/ports/mongo-c-driver/fix-dependencies.patch index 510abe0725..90c9585c55 100644 --- a/ports/mongo-c-driver/fix-dependencies.patch +++ b/ports/mongo-c-driver/fix-dependencies.patch @@ -18,23 +18,23 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt index d108e5d..a097016 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -55,7 +55,7 @@ configure_file ( +@@ -51,7 +51,7 @@ configure_file ( set (ZLIB_INCLUDE_DIRS "") if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") message (STATUS "Searching for zlib CMake packages") - include (FindZLIB) + find_package(ZLIB REQUIRED) if (ZLIB_FOUND) - message ("-- zlib found version \"${ZLIB_VERSION_STRING}\"") - message ("-- zlib include path \"${ZLIB_INCLUDE_DIRS}\"") -@@ -150,7 +150,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + message (STATUS " zlib found version \"${ZLIB_VERSION_STRING}\"") + message (STATUS " zlib include path \"${ZLIB_INCLUDE_DIRS}\"") +@@ -146,7 +146,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) if (ENABLE_SSL STREQUAL "OPENSSL" OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) # Sets OPENSSL_FOUND on success. - include (FindOpenSSL) + find_package(OpenSSL REQUIRED) endif () - + if (ENABLE_SSL STREQUAL LIBRESSL) @@ -364,10 +364,10 @@ else () endif () diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index fc1f6116c3..f04c6575ad 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e + SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 HEAD_REF master PATCHES disable-dynamic-when-static.patch @@ -48,7 +48,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} - -DENABLE_BSON=SYSTEM + -DUSE_SYSTEM_LIBBSON=ON -DENABLE_EXAMPLES=OFF -DENABLE_SHM_COUNTERS=OFF -DENABLE_STATIC=${ENABLE_STATIC} diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index db0a19e568..ef533e5213 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.22.2", + "version": "1.24.3", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/ports/mongo-cxx-driver/fix-dependencies.patch b/ports/mongo-cxx-driver/fix-dependencies.patch index fde0d3b666..215a31a056 100644 --- a/ports/mongo-cxx-driver/fix-dependencies.patch +++ b/ports/mongo-cxx-driver/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index d87d588..16ba095 100644 +index f30aea836..50610ffb1 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt -@@ -218,6 +221,9 @@ if(BSONCXX_BUILD_STATIC) +@@ -215,6 +215,9 @@ if(BSONCXX_BUILD_STATIC) bsoncxx_install_deprecated_cmake(bsoncxx-static) list(APPEND bsoncxx_target_list bsoncxx_static) set(bsoncxx_pkg_dep "find_dependency(bson-1.0 REQUIRED)") @@ -10,5 +10,5 @@ index d87d588..16ba095 100644 + string(APPEND bsoncxx_pkg_dep "\nfind_dependency(Boost)") + endif() endif() - bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}") - + if(BSONCXX_POLY_USE_BOOST) + set(bsoncxx_boost_pkg_dep "find_dependency(Boost 1.56.0 REQUIRED)") diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index a356e69c41..c943f3e4d0 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 de4737fab399e342c8153b2a14d097e54250fd66ca58c3120634bc08cb1943dc2808b81adf8e7a2f7edeb12607ae418c887667548600eee585ba5b27ebdf16b5 + SHA512 f9f0d83ee2ef1f3c2dae1f3663b893d819737d4e646d0137fb623b84663382eb93ab36123c2a85247f43ae979a95276fa231d5da8ad62a6da002ab9daecaa0d4 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 7927358b5e..76231b86e6 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.7.2", + "version": "3.8.0", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 466249753a..8d10fbc837 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3937,7 +3937,7 @@ "port-version": 4 }, "libbson": { - "baseline": "1.22.2", + "baseline": "1.24.3", "port-version": 0 }, "libcaer": { @@ -5433,11 +5433,11 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.22.2", + "baseline": "1.24.3", "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.7.2", + "baseline": "3.8.0", "port-version": 0 }, "mongoose": { diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 2a8edfb47e..0fe63b0700 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a3f08e9e91a77ee7b6b56f88d1e0013349c34e1", + "version": "1.24.3", + "port-version": 0 + }, { "git-tree": "c50f1bbb02e6ac4f6b6f928f4c931922017997d9", "version": "1.22.2", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 6fd3feed83..f94ce8b967 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9ddb78bc06cb779848d6afffa88938870ae8a7b", + "version": "1.24.3", + "port-version": 0 + }, { "git-tree": "b840350590e947daec430cfea1445d958ae6f5fa", "version": "1.22.2", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 3c0b826398..8808aec243 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8fc862744aad29acd0e6a0d947fc5b561d3f5f7", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "00588be07af8844394ca81106324a42f5d29d684", "version": "3.7.2",