From e6a1dc4f53017b75f747adea876f4750ec23f795 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:37:32 -0800 Subject: [PATCH] [vcpkg baseline][mongo-c-driver] Fix the race condition during CMake configure (#36099) * [vcpkg baseline][mongo-c-driver] Fix the race condition during CMake configure * update version * update fix * update version --- ports/mongo-c-driver/portfile.cmake | 6 +++--- ports/mongo-c-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index c45ce6147f..d54926f636 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,7 +1,4 @@ # This port needs to be updated at the same time as libbson - -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver @@ -45,6 +42,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS ${OPTIONS} "-DBUILD_VERSION=${VERSION}" @@ -56,6 +54,8 @@ vcpkg_cmake_configure( -DENABLE_UNINSTALL=OFF -DENABLE_ZLIB=SYSTEM -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH + -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON MAYBE_UNUSED_VARIABLES ENABLE_ICU ) diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index a54e6fc09c..8db615bb11 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-c-driver", "version": "1.25.4", + "port-version": 1, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d82bc77569..2bf0507fe1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5674,7 +5674,7 @@ }, "mongo-c-driver": { "baseline": "1.25.4", - "port-version": 0 + "port-version": 1 }, "mongo-cxx-driver": { "baseline": "3.9.0", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index d601444413..394c36ac86 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a6dfbb8124275c3987495969f7f79e5a7023b74", + "version": "1.25.4", + "port-version": 1 + }, { "git-tree": "219d51be972af0596a2c538b530fc379d136fcb2", "version": "1.25.4",