mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 10:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[grpc] Update grpc to 1.23.0 (#8109)

Browse Source
This commit is contained in:
Jozef Izso 2019-09-09 17:59:28 +02:00 committed by Curtis J Bezault
parent e87cc3abb7
commit 135474a730
4 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/grpc/00006-crypt32.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3ca615..21b5aaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,7 @@ elseif(UNIX)
endif()
if(WIN32 AND MSVC)
- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32)
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32 crypt32)
endif()
# Create directory for generated .proto files

34
ports/grpc/00007-disable_grpcpp_channelz.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1961995..d721654 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4692,7 +4692,7 @@ if (gRPC_INSTALL)
endif()
-if (gRPC_BUILD_CODEGEN)
+if (gRPC_BUILD_CODEGEN AND NOT gRPC_USE_PROTO_LITE)
add_library(grpcpp_channelz
src/cpp/server/channelz/channelz_service.cc
src/cpp/server/channelz/channelz_service_plugin.cc
@@ -4749,7 +4749,7 @@ foreach(_hdr
endforeach()
-if (gRPC_BUILD_CODEGEN)
+if (gRPC_BUILD_CODEGEN AND NOT gRPC_USE_PROTO_LITE)
if (gRPC_INSTALL)
install(TARGETS grpcpp_channelz EXPORT gRPCTargets
@@ -4758,9 +4758,9 @@ if (gRPC_INSTALL)
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
)
endif()
-endif (gRPC_BUILD_CODEGEN)
+endif (gRPC_BUILD_CODEGEN AND NOT gRPC_USE_PROTO_LITE)
-endif (gRPC_BUILD_CODEGEN)
+endif (gRPC_BUILD_CODEGEN AND NOT gRPC_USE_PROTO_LITE)
if (gRPC_BUILD_TESTS)
if (gRPC_BUILD_CODEGEN)

2
ports/grpc/CONTROL
View File

@ -1,5 +1,5 @@
Source: grpc
Version: 1.22.0
Version: 1.23.0
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
Homepage: https://github.com/grpc/grpc
Description: An RPC library and framework

6
ports/grpc/portfile.cmake
View File

@ -13,8 +13,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF 08fd59f039c7cf62614ab7741b3f34527af103c7
SHA512 a1200e0df981f69f9831425a5187dcc843d9eadee1663150cd3aa10d388ae0693ac6aa57760d7047ce1e6c55a15339d1db2f1b6e25f84c76ad97e0b48706e2c4
REF v1.23.0
SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
HEAD_REF master
PATCHES
00001-fix-uwp.patch
@ -22,6 +22,8 @@ vcpkg_from_github(
00003-undef-base64-macro.patch
00004-link-gdi32-on-windows.patch
00005-fix-uwp-error.patch
00006-crypt32.patch
00007-disable_grpcpp_channelz.patch
)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")