early-access version 2853
This commit is contained in:
pineappleEA
139
externals/vcpkg/ports/libbson/fix-uwp.patch
vendored
Executable file
139
externals/vcpkg/ports/libbson/fix-uwp.patch
vendored
Executable file
@@ -0,0 +1,139 @@
|
||||
diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
|
||||
index bb8259b85..0197af068 100644
|
||||
--- a/src/libbson/CMakeLists.txt
|
||||
+++ b/src/libbson/CMakeLists.txt
|
||||
@@ -230,6 +230,9 @@ set (HEADERS_FORWARDING
|
||||
${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h
|
||||
)
|
||||
|
||||
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
+
|
||||
+if (NOT ENABLE_STATIC MATCHES "ON|AUTO")
|
||||
add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
|
||||
set (CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
target_compile_definitions (bson_shared PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN)
|
||||
@@ -279,9 +282,13 @@ 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})
|
||||
+ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
+ set(THREADS_PREFER_PTHREAD_FLAG 1)
|
||||
+ find_package(Threads REQUIRED)
|
||||
target_compile_definitions (bson_static
|
||||
PUBLIC BSON_STATIC
|
||||
PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN
|
||||
@@ -299,6 +306,7 @@ if (MONGOC_ENABLE_STATIC_BUILD)
|
||||
if (RT_LIBRARY)
|
||||
target_link_libraries (bson_static ${RT_LIBRARY})
|
||||
endif ()
|
||||
+ find_library(M_LIBRARY m)
|
||||
if (M_LIBRARY)
|
||||
target_link_libraries (bson_static ${M_LIBRARY})
|
||||
endif ()
|
||||
@@ -313,7 +321,7 @@ function (add_example bin src)
|
||||
add_executable (${bin} ${BSON_EXAMPLE_SOURCES})
|
||||
|
||||
# Link against the shared lib like normal apps
|
||||
- target_link_libraries (${bin} bson_shared)
|
||||
+ target_link_libraries (${bin} bson_shared bson_static)
|
||||
|
||||
set (EXAMPLES ${EXAMPLES} ${bin})
|
||||
endfunction ()
|
||||
@@ -337,7 +345,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 ()
|
||||
diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
|
||||
index af5a398a9..78d02bdee 100644
|
||||
--- a/src/libmongoc/CMakeLists.txt
|
||||
+++ b/src/libmongoc/CMakeLists.txt
|
||||
@@ -725,6 +725,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH)
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
+if (NOT MONGOC_ENABLE_STATIC)
|
||||
add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
|
||||
set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
|
||||
@@ -744,6 +745,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION ${KMS_MSG_D
|
||||
|
||||
set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
|
||||
set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}")
|
||||
+endif ()
|
||||
|
||||
if (MONGOC_ENABLE_STATIC_BUILD)
|
||||
add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
|
||||
@@ -778,7 +780,11 @@ if (ENABLE_APPLE_FRAMEWORK)
|
||||
endif ()
|
||||
|
||||
add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c)
|
||||
+if (MONGOC_ENABLE_STATIC)
|
||||
+target_link_libraries (mongoc-stat mongoc_static)
|
||||
+else ()
|
||||
target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES})
|
||||
+endif ()
|
||||
|
||||
# mongoc-stat works if shared memory performance counters are enabled.
|
||||
if (ENABLE_SHM_COUNTERS STREQUAL "ON")
|
||||
@@ -1040,7 +1046,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR}
|
||||
file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests)
|
||||
|
||||
if (MONGOC_ENABLE_STATIC_INSTALL)
|
||||
- set (TARGETS_TO_INSTALL mongoc_shared mongoc_static)
|
||||
+ set (TARGETS_TO_INSTALL mongoc_static)
|
||||
else ()
|
||||
set (TARGETS_TO_INSTALL mongoc_shared)
|
||||
endif ()
|
||||
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
|
||||
index 0690b8680..98721df86 100644
|
||||
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
|
||||
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
|
||||
@@ -765,7 +765,7 @@ _mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file)
|
||||
bson_t query;
|
||||
bson_t child;
|
||||
bson_t opts;
|
||||
- const bson_t *chunk;
|
||||
+ const bson_t *chunk = NULL;
|
||||
const char *key;
|
||||
bson_iter_t iter;
|
||||
int64_t existing_chunks;
|
||||
diff --git a/src/libmongoc/src/mongoc/mongoc-handshake.c b/src/libmongoc/src/mongoc/mongoc-handshake.c
|
||||
index 5378015b8..c8e6dd6a7 100644
|
||||
--- a/src/libmongoc/src/mongoc/mongoc-handshake.c
|
||||
+++ b/src/libmongoc/src/mongoc/mongoc-handshake.c
|
||||
@@ -290,7 +290,8 @@ _get_os_version (void)
|
||||
char *ret = bson_malloc (HANDSHAKE_OS_VERSION_MAX);
|
||||
bool found = false;
|
||||
|
||||
-#ifdef _WIN32
|
||||
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
|
||||
+#elif defined (_WIN32)
|
||||
OSVERSIONINFO osvi;
|
||||
ZeroMemory (&osvi, sizeof (OSVERSIONINFO));
|
||||
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
|
||||
diff --git a/src/libmongoc/src/mongoc/mongoc-util.c b/src/libmongoc/src/mongoc/mongoc-util.c
|
||||
index 0bbee03ef..6b66da741 100644
|
||||
--- a/src/libmongoc/src/mongoc/mongoc-util.c
|
||||
+++ b/src/libmongoc/src/mongoc/mongoc-util.c
|
||||
@@ -85,7 +85,11 @@ _mongoc_hex_md5 (const char *input)
|
||||
void
|
||||
_mongoc_usleep (int64_t usec)
|
||||
{
|
||||
-#ifdef _WIN32
|
||||
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
|
||||
+ if (usec / 1000 > MAXDWORD || usec < 0)
|
||||
+ __fastfail(-1);
|
||||
+ Sleep((DWORD)(usec / 1000));
|
||||
+#elif defined(_WIN32)
|
||||
LARGE_INTEGER ft;
|
||||
HANDLE timer;
|
||||
|
||||
Reference in New Issue
Block a user