diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-24 05:36:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 14:36:26 -0700 |
| commit | c75f0b32a674533c619623dd9fe14b2c5a86b926 (patch) | |
| tree | e4c33bab3d54c69663312805418fe51692ba3d88 /ports/offscale-libetcd-cpp | |
| parent | db748954976decfe9393f5505bf89587399f4902 (diff) | |
| download | vcpkg-c75f0b32a674533c619623dd9fe14b2c5a86b926.tar.gz vcpkg-c75f0b32a674533c619623dd9fe14b2c5a86b926.zip | |
[grpc] Update to 1.29.1 (#11791)
* [grpc] Update to 1.29.1
* re-fix uwp build
* re-fix dependency upb
* [offscale-libetcd-cpp] Fix dependency grpc
Diffstat (limited to 'ports/offscale-libetcd-cpp')
| -rw-r--r-- | ports/offscale-libetcd-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/offscale-libetcd-cpp/fix-dependency-grpc.patch | 13 | ||||
| -rw-r--r-- | ports/offscale-libetcd-cpp/portfile.cmake | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/ports/offscale-libetcd-cpp/CONTROL b/ports/offscale-libetcd-cpp/CONTROL index ec080142c..e164c928e 100644 --- a/ports/offscale-libetcd-cpp/CONTROL +++ b/ports/offscale-libetcd-cpp/CONTROL @@ -1,5 +1,5 @@ Source: offscale-libetcd-cpp -Version: 2019-07-10 +Version: 2019-07-10-1 Homepage: https://github.com/offscale/libetcd-cpp Description: A C++ client library for etcd. etcd is a distributed, reliable key-value store. Build-Depends: grpc, protobuf diff --git a/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch b/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch new file mode 100644 index 000000000..652720333 --- /dev/null +++ b/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d9aad9..d68c5f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ endif() + target_include_directories(etcdcpp PRIVATE "generated/") + target_include_directories(etcdcpp INTERFACE "${CMAKE_INSTALL_PREFIX}/include") + +-target_link_libraries(etcdcpp PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++ gRPC::grpc_cronet) ++target_link_libraries(etcdcpp PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++ gRPC::grpc++_alts) + target_link_libraries(etcdcpp PRIVATE protobuf::libprotoc protobuf::libprotobuf) + + install(TARGETS etcdcpp EXPORT etcdcpp DESTINATION lib) diff --git a/ports/offscale-libetcd-cpp/portfile.cmake b/ports/offscale-libetcd-cpp/portfile.cmake index ffe4519f8..e6857aa3d 100644 --- a/ports/offscale-libetcd-cpp/portfile.cmake +++ b/ports/offscale-libetcd-cpp/portfile.cmake @@ -1,11 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offscale/libetcd-cpp REF 8607d8d7080c6eb447bc41b799a24bfdb87cf638 SHA512 9bf4bf14fd52f4f6bbf8cf68de61e6a19eeffbdc501f05c8f614b5f13f206410884afd7fe226a077448e58e02990c65a6b27ee895ed34ba5ee701abe0500b875 HEAD_REF master + PATCHES fix-dependency-grpc.patch ) vcpkg_configure_cmake( @@ -14,6 +13,6 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/offscale-libetcd-cpp RENAME copyright) - vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |