Skip to content

[vcpkg baseline][libbson] Fix race condition during CMake configure #35586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 4 commits into from
Dec 12, 2023
Merged

[vcpkg baseline][libbson] Fix race condition during CMake configure #35586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2f41fa
Delete unused patches
Thomas1664 Dec 10, 2023
c8886f6
disable finding Python
Thomas1664 Dec 10, 2023
d3530e7
Fix race during CMake configure
Thomas1664 Dec 10, 2023
74593dd
version
Thomas1664 Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions ports/libbson/disable-dynamic-when-static.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ports/libbson/fix-missing-header.patch
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ports/libbson/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion ports/libbson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4110,7 +4110,7 @@
},
"libbson": {
"baseline": "1.25.1",
"port-version": 1
"port-version": 2
},
"libcaer": {
"baseline": "3.3.15",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libbson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c",
"version": "1.25.1",
"port-version": 2
},
{
"git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4",
"version": "1.25.1",
Expand Down