From 6eab0a7b21ccd0edb1efddf3ef6ffdb4e0dae915 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 21 Dec 2024 04:31:35 +0800 Subject: [PATCH] [mongo-cxx-driver] update to 4.0.0 (#42805) --- ports/mongo-cxx-driver/portfile.cmake | 14 +------------- ports/mongo-cxx-driver/vcpkg.json | 17 ++--------------- .../vcpkg-ci-mongo-cxx-driver/portfile.cmake | 1 - .../vcpkg-ci-mongo-cxx-driver/vcpkg.json | 14 -------------- versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 6 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake delete mode 100644 scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index f3d6a44c41..22e2e6fed7 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 620112ab91ad5fc0eb900b4b271cf40bac92ec728f0da2053dd42a80cc444910c3784f83c638b5aa1323cfa57308622b034b5c9275c4d2c92cbbbd7bb3eb1b08 + SHA512 7b6564cb5087b03886f3c99aa5da9e87a898b1bd1098393a7668e39d673d6203a39f7fa95e5bef995f5e53c18654ef1806823cf643a994a8c19a1df75b9eb306 HEAD_REF master PATCHES fix-dependencies.patch @@ -10,20 +10,9 @@ vcpkg_from_github( file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}") -# This port offered C++17 ABI alternative via features. -# This was reduced to boost only. -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - boost BSONCXX_POLY_USE_BOOST - INVERTED_FEATURES - boost BSONCXX_POLY_USE_STD - boost CMAKE_DISABLE_FIND_PACKAGE_Boost -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} "-DCMAKE_PROJECT_MONGO_CXX_DRIVER_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DBSONCXX_HEADER_INSTALL_DIR=include -DENABLE_TESTS=OFF @@ -31,7 +20,6 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include -DNEED_DOWNLOAD_C_DRIVER=OFF MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Boost BSONCXX_HEADER_INSTALL_DIR MONGOCXX_HEADER_INSTALL_DIR ) diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index b169fed420..54a35e1999 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.11.0", + "version": "4.0.0", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", @@ -15,18 +15,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "boost": { - "description": [ - "Enables the Boost C++17 polyfill for bsoncxx.", - "Warning: This feature changes the ABI." - ], - "dependencies": [ - "boost-optional", - "boost-smart-ptr", - "boost-utility" - ] - } - } + ] } diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake deleted file mode 100644 index 065116c276..0000000000 --- a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json deleted file mode 100644 index 3eb7d03929..0000000000 --- a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "vcpkg-ci-mongo-cxx-driver", - "version-date": "2022-11-18", - "description": "Ensures that the vcpkg CI build of mongo-cxx-driver includes feature boost", - "license": "MIT", - "dependencies": [ - { - "name": "mongo-cxx-driver", - "features": [ - "boost" - ] - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index b2ad299032..83a4286f21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6045,7 +6045,7 @@ "port-version": 1 }, "mongo-cxx-driver": { - "baseline": "3.11.0", + "baseline": "4.0.0", "port-version": 0 }, "mongoose": { diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 759ad36b65..3c496ddffe 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6189b50c8af944ed1231b6e30672b49a1a988c85", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "7fb58e0dc8d80bb5e013c724129133d335d9ea8a", "version": "3.11.0",