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

[grpc] Update to v1.33.1 (#14187)

Browse Source
This commit is contained in:
Jozef Izso 2020-10-28 04:33:33 +01:00 committed by GitHub
parent ff413776db
commit 79e72302cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/grpc/00001-fix-uwp.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4655d1e747..b8514d91a8 100644
index 1911144984..8f78306f77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,6 +181,9 @@ if(UNIX)

2
ports/grpc/00002-static-linking-in-linux.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8514d91a8..d0e6cbeaf9 100644
index 8f78306f77..e09f8fcc1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)

2
ports/grpc/00004-link-gdi32-on-windows.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0e6cbeaf9..e3fe2990e0 100644
index e09f8fcc1e..ec1714687e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,7 @@ elseif(UNIX)

4
ports/grpc/00005-fix-uwp-error.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
index 0dacbfe..0743a1b 100644
index 0dacbfef3e..0743a1b003 100644
--- a/src/core/lib/slice/slice.cc
+++ b/src/core/lib/slice/slice.cc
@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
@ -20,7 +20,7 @@ index 0dacbfe..0743a1b 100644
slice.refcount = nullptr;
slice.data.inlined.length = str.size();
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index c945515..3fd9797 100644
index c94551545d..3fd9797316 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {

28
ports/grpc/00009-use-system-upb.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3fe299..4bae849 100644
index ec1714687e..e15d25097f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
@ -12,7 +12,7 @@ index e3fe299..4bae849 100644
set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
@@ -1891,7 +1894,6 @@ target_link_libraries(grpc
@@ -1911,7 +1914,6 @@ target_link_libraries(grpc
${_gRPC_ALLTARGETS_LIBRARIES}
gpr
address_sorting
@ -20,7 +20,7 @@ index e3fe299..4bae849 100644
absl::optional
absl::strings
absl::status
@@ -1973,7 +1975,6 @@ target_link_libraries(grpc_csharp_ext
@@ -1993,7 +1995,6 @@ target_link_libraries(grpc_csharp_ext
grpc
gpr
address_sorting
@ -28,7 +28,7 @@ index e3fe299..4bae849 100644
)
@@ -2503,7 +2504,6 @@ target_link_libraries(grpc_unsecure
@@ -2463,7 +2464,6 @@ target_link_libraries(grpc_unsecure
${_gRPC_ALLTARGETS_LIBRARIES}
gpr
address_sorting
@ -36,7 +36,7 @@ index e3fe299..4bae849 100644
absl::optional
absl::strings
absl::status
@@ -2701,7 +2701,6 @@ target_link_libraries(grpc++
@@ -2661,7 +2661,6 @@ target_link_libraries(grpc++
grpc
gpr
address_sorting
@ -44,7 +44,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -2963,7 +2962,6 @@ target_link_libraries(grpc++_alts
@@ -2907,7 +2906,6 @@ target_link_libraries(grpc++_alts
grpc
gpr
address_sorting
@ -52,7 +52,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -3032,7 +3030,6 @@ target_link_libraries(grpc++_error_details
@@ -2976,7 +2974,6 @@ target_link_libraries(grpc++_error_details
grpc
gpr
address_sorting
@ -60,7 +60,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -3105,7 +3102,6 @@ target_link_libraries(grpc++_reflection
@@ -3049,7 +3046,6 @@ target_link_libraries(grpc++_reflection
grpc
gpr
address_sorting
@ -68,7 +68,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -3386,7 +3382,6 @@ target_link_libraries(grpc++_unsecure
@@ -3330,7 +3326,6 @@ target_link_libraries(grpc++_unsecure
grpc_unsecure
gpr
address_sorting
@ -76,7 +76,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -3720,7 +3715,6 @@ target_link_libraries(grpcpp_channelz
@@ -3648,7 +3643,6 @@ target_link_libraries(grpcpp_channelz
grpc
gpr
address_sorting
@ -84,7 +84,7 @@ index e3fe299..4bae849 100644
)
foreach(_hdr
@@ -3747,6 +3741,7 @@ endif()
@@ -3675,6 +3669,7 @@ endif()
endif()
@ -92,7 +92,7 @@ index e3fe299..4bae849 100644
add_library(upb
third_party/upb/upb/decode.c
third_party/upb/upb/encode.c
@@ -3798,7 +3793,7 @@ if(gRPC_INSTALL)
@@ -3726,7 +3721,7 @@ if(gRPC_INSTALL)
)
endif()
@ -102,7 +102,7 @@ index e3fe299..4bae849 100644
add_executable(check_epollexclusive
test/build/check_epollexclusive.c
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
index 3623f4a..df6ced5 100644
index 3623f4aa5e..df6ced560e 100644
--- a/cmake/gRPCConfig.cmake.in
+++ b/cmake/gRPCConfig.cmake.in
@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
@ -114,7 +114,7 @@ index 3623f4a..df6ced5 100644
# Targets
include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
index f2a0e50..ecce7ba 100644
index f2a0e508c3..ecce7ba300 100644
--- a/cmake/upb.cmake
+++ b/cmake/upb.cmake
@@ -12,9 +12,20 @@

8
ports/grpc/00010-add-feature-absl-sync.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bae849..a23fdf3 100644
index e15d25097f..ae77375eae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1899,6 +1899,8 @@ target_link_libraries(grpc
@@ -1919,6 +1919,8 @@ target_link_libraries(grpc
absl::status
absl::inlined_vector
absl::flat_hash_set
@ -11,7 +11,7 @@ index 4bae849..a23fdf3 100644
)
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc "-framework CoreFoundation")
@@ -2508,6 +2510,8 @@ target_link_libraries(grpc_unsecure
@@ -2468,6 +2470,8 @@ target_link_libraries(grpc_unsecure
absl::strings
absl::status
absl::inlined_vector
@ -21,7 +21,7 @@ index 4bae849..a23fdf3 100644
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_unsecure "-framework CoreFoundation")
diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
index 078d495..b6f50bd 100644
index 078d495417..b6f50bd14c 100644
--- a/cmake/abseil-cpp.cmake
+++ b/cmake/abseil-cpp.cmake
@@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")

6
ports/grpc/00011-fix-csharp_plugin.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a23fdf3dda..7eb8d5200a 100644
index ae77375eae..ad8815d2f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1940,10 +1940,14 @@ endif()
@@ -1960,10 +1960,14 @@ endif()
if(gRPC_BUILD_CSHARP_EXT)
@ -18,7 +18,7 @@ index a23fdf3dda..7eb8d5200a 100644
set_target_properties(grpc_csharp_ext PROPERTIES
VERSION ${gRPC_CORE_VERSION}
SOVERSION ${gRPC_CORE_SOVERSION}
@@ -1957,6 +1961,12 @@ if(WIN32 AND MSVC)
@@ -1977,6 +1981,12 @@ if(WIN32 AND MSVC)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb
DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
)

5
ports/grpc/CONTROL
View File

@ -1,9 +1,8 @@
Source: grpc
Version: 1.32.0
Port-Version: 1
Version: 1.33.1
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2
Homepage: https://github.com/grpc/grpc
Description: An RPC library and framework
Feature: absl-sync
Description: Use abseil synchronization module
Description: Use abseil synchronization module

4
ports/grpc/portfile.cmake
View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF 414bb8322de2411eee1f4e841ff29d887bec7884 # v1.32.0
SHA512 a4fb0c926622c15a878fa475ecd670b076d1238332d174a5fb0aa987789d54a1d605ea6d4a7c705addf3c429e8b3b646e0f1f611715e84196a7fb958e1ff5945
REF 054ff69350dfea1876f388e7cf05f19d5d76bc12 # v1.33.1
SHA512 d81c26e996f8a4386a432fc98ba0982c9a15e8cb470eb544f82dc81df5a8f79401343d209f3aa75598fbb8b99cc05dcd2a0e616967d5e0464bed4a4464d7fdc1
HEAD_REF master
PATCHES
00001-fix-uwp.patch