diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-03-26 11:43:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 20:43:02 -0700 |
| commit | d98696de851170a5ac24da346b2656023f8db370 (patch) | |
| tree | 6d7fd7be49dc48173fd1725c0dbd696c95a213a6 /ports/mongo-c-driver | |
| parent | 42ad12f91d62a6533d909d8b5ee3a46009c2a10a (diff) | |
| download | vcpkg-d98696de851170a5ac24da346b2656023f8db370.tar.gz vcpkg-d98696de851170a5ac24da346b2656023f8db370.zip | |
[vcpkg baseline] Fix CI test (#10508)
* re-trigger ci test
* [kealib] Switch repo to github
* [mongo-c-driver] Set icu as a feature
* [monkeys-audio] Update version to 5.24
* [mongo-c-driver] Fix arm build
* [mongo-c-driver] Re-generate patch
* [mongo-c-driver] Remove key word PRIVATE in patch
* [llvm] Remove default feature tools
* [llvm] Add judgment to install tools
* [llvm] Add more condition
* [llvm] Fix clang cmake files when selecting feature tools
* [halide] Fix build depends info in CONTROL
* update baseline
Diffstat (limited to 'ports/mongo-c-driver')
| -rw-r--r-- | ports/mongo-c-driver/CONTROL | 4 | ||||
| -rw-r--r-- | ports/mongo-c-driver/fix-arm-build.patch | 24 | ||||
| -rw-r--r-- | ports/mongo-c-driver/portfile.cmake | 2 |
3 files changed, 30 insertions, 0 deletions
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index efc81c03a..643b2ec5f 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -7,3 +7,7 @@ Homepage: https://github.com/mongodb/mongo-c-driver Feature: snappy Description: Enables snappy compressor support Build-Depends: snappy + +Feature: icu +Description: Enable ICU support, necessary to use non-ASCII usernames or passwords +Build-Depends: icu
\ No newline at end of file diff --git a/ports/mongo-c-driver/fix-arm-build.patch b/ports/mongo-c-driver/fix-arm-build.patch new file mode 100644 index 000000000..06d042b15 --- /dev/null +++ b/ports/mongo-c-driver/fix-arm-build.patch @@ -0,0 +1,24 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index c8a4f02..78f69f2 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -645,6 +645,9 @@ endif () + 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 ${LIBRARIES} ${BSON_LIBRARIES}) ++if (WIN32) ++ target_link_libraries (mongoc_shared Advapi32) ++endif() + target_include_directories (mongoc_shared BEFORE PUBLIC ${BSON_INCLUDE_DIRS} ${MONGOC_INTERNAL_INCLUDE_DIRS}) + target_compile_definitions (mongoc_shared PUBLIC MONGOC_COMPILATION ${BSON_DEFINITIONS}) + +@@ -654,6 +657,9 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "mongoc-${MONGOC_API + if (MONGOC_ENABLE_STATIC) + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + target_link_libraries (mongoc_static ${LIBRARIES} ${BSON_STATIC_LIBRARIES}) ++ if (WIN32) ++ target_link_libraries (mongoc_static Advapi32) ++ endif() + target_include_directories (mongoc_static BEFORE PUBLIC ${BSON_STATIC_INCLUDE_DIRS} ${MONGOC_INTERNAL_INCLUDE_DIRS}) + target_compile_definitions (mongoc_static PUBLIC MONGOC_COMPILATION MONGOC_STATIC ${BSON_STATIC_DEFINITIONS}) + set_target_properties (mongoc_static PROPERTIES VERSION 0.0.0) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index a138f7872..0c737a0f4 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -4,10 +4,12 @@ vcpkg_from_github( REF 541086adcf1eecf88ac09fda47d9a8ec1598015d # debian/1.15.1-1
SHA512 a57438dfae9d0993ae04b7a76677f79331699898f21e7645db5edd2c91014f33b738a0af67b58234d1ee03aab2ae3b58c183bbd043fc2bde5cc1a4e111755b70
HEAD_REF master
+ PATCHES fix-arm-build.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"snappy" ENABLE_SNAPPY
+ "icu" ENABLE_ICU
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|