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

* Delete unused patches

* disable finding Python

* Fix race during CMake configure

* version
This commit is contained in:
Thomas1664 2023-12-12 10:20:57 +01:00 committed by GitHub
parent 6f3385962b
commit 9ca8099ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 58 deletions

View File

@ -1,44 +0,0 @@
diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
index 61e926747..6b4c5a911 100644
--- a/src/libbson/CMakeLists.txt
+++ b/src/libbson/CMakeLists.txt
@@ -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})
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})
@@ -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 ()
@@ -418,12 +420,14 @@ configure_file (
${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc
@ONLY)
+if(NOT MONGOC_ENABLE_STATIC_INSTALL)
install (
FILES
${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc
DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
+endif()
if (MONGOC_ENABLE_STATIC_INSTALL)
configure_file (

View File

@ -1,12 +0,0 @@
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

View File

@ -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
)

View File

@ -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,

View File

@ -4110,7 +4110,7 @@
},
"libbson": {
"baseline": "1.25.1",
"port-version": 1
"port-version": 2
},
"libcaer": {
"baseline": "3.3.15",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c",
"version": "1.25.1",
"port-version": 2
},
{
"git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4",
"version": "1.25.1",