[vcpkg baseline][libbson] Fix race condition during CMake configure (m…

…icrosoft#35586) * Delete unused patches * disable finding Python * Fix race during CMake configure * version
autoantwort · Dec 13, 2023 · 2979578 · 2979578
1 parent d20250c
commit 2979578
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 58 deletions.
diff --git a/ports/libbson/disable-dynamic-when-static.patch b/ports/libbson/disable-dynamic-when-static.patch
diff --git a/ports/libbson/fix-missing-header.patch b/ports/libbson/fix-missing-header.patch
diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
@@ -24,6 +24,7 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE # because it writes the file VERSION_CURRENT in the source directory
     OPTIONS
         "-DBUILD_VERSION=${VERSION}"
         -DENABLE_BSON=ON
@@ -40,6 +41,8 @@ vcpkg_cmake_configure(
         -DENABLE_UNINSTALL=OFF
         -DENABLE_ZLIB=SYSTEM
         -DENABLE_ZSTD=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
     MAYBE_UNUSED_VARIABLES
         ENABLE_ICU
 )

diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libbson",
   "version": "1.25.1",
-  "port-version": 1,
+  "port-version": 2,
   "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/versions/baseline.json b/versions/baseline.json
@@ -4110,7 +4110,7 @@
     },
     "libbson": {
       "baseline": "1.25.1",
-      "port-version": 1
+      "port-version": 2
     },
     "libcaer": {
       "baseline": "3.3.15",

diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c",
+      "version": "1.25.1",
+      "port-version": 2
+    },
     {
       "git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4",
       "version": "1.25.1",