[gRPC] Update to 1.27.1 (#9963)

* gRPC 1.27.0

* trigger build

* update to v1.27.1

* update control file
This commit is contained in:
ymshenyu 2020-02-12 08:33:48 +08:00 committed by GitHub
parent 61bb3713f4
commit acdbfaec17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 192 additions and 187 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d4418a..a2f23d5 100644 index 3f9d19e..25d96ab 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -104,6 +104,9 @@ if(UNIX) @@ -144,6 +144,9 @@ if(UNIX)
endif() endif()
if(WIN32) if(WIN32)
set(_gRPC_PLATFORM_WINDOWS ON) set(_gRPC_PLATFORM_WINDOWS ON)
@ -12,7 +12,7 @@ index 3d4418a..a2f23d5 100644
endif() endif()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
@@ -119,6 +122,9 @@ if(MSVC) @@ -160,6 +163,9 @@ if(MSVC)
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
# TODO(jtattermusch): needed to build boringssl with VS2017, revisit later # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
@ -22,7 +22,7 @@ index 3d4418a..a2f23d5 100644
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}")
@@ -186,6 +192,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) @@ -228,6 +234,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
# ``.proto`` files # ``.proto`` files
# #
function(protobuf_generate_grpc_cpp) function(protobuf_generate_grpc_cpp)
@ -33,7 +33,7 @@ index 3d4418a..a2f23d5 100644
if(NOT ARGN) if(NOT ARGN)
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
return() return()
@@ -258,6 +268,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) @@ -300,6 +310,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
endif () endif ()
@ -41,7 +41,7 @@ index 3d4418a..a2f23d5 100644
add_custom_target(plugins add_custom_target(plugins
DEPENDS ${_gRPC_PLUGIN_LIST} DEPENDS ${_gRPC_PLUGIN_LIST}
) )
@@ -279,6 +290,7 @@ add_custom_target(tools_cxx @@ -321,6 +332,7 @@ add_custom_target(tools_cxx
add_custom_target(tools add_custom_target(tools
DEPENDS tools_c tools_cxx) DEPENDS tools_c tools_cxx)

View File

@ -1,10 +1,10 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2f23d5..e433e8d 100644 index 25d96ab..c4057b3 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -111,6 +111,11 @@ endif() @@ -152,6 +152,11 @@ endif()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS) +if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
+ # Force to static link + # Force to static link

View File

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6c4a340fc..22054eedd0 100644 index c4057b3..a6a0f23 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -164,7 +164,7 @@ elseif(UNIX) @@ -220,7 +220,7 @@ elseif(UNIX)
endif() endif()
if(WIN32 AND MSVC) if(WIN32 AND MSVC)
- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32) - set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32)
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
endif() endif()
# Create directory for generated .proto files # Create directory for generated .proto files

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22054eedd0..a7fdb1fcd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,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

View File

@ -1,8 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b535f10..0fcb682 100644 index a6a0f23..1c170da 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1530,7 +1530,7 @@ target_link_libraries(grpc @@ -1281,7 +1281,7 @@ target_link_libraries(alts_test_util
${_gRPC_ALLTARGETS_LIBRARIES}
grpc
gpr
- upb
+ ${_gRPC_UPB_LIBRARIES}
)
foreach(_hdr
@@ -1917,7 +1917,7 @@ target_link_libraries(grpc
${_gRPC_UPB_LIBRARIES} ${_gRPC_UPB_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
@ -11,7 +20,7 @@ index b535f10..0fcb682 100644
) )
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc "-framework CoreFoundation") target_link_libraries(grpc "-framework CoreFoundation")
@@ -1941,7 +1941,7 @@ target_link_libraries(grpc_cronet @@ -2328,7 +2328,7 @@ target_link_libraries(grpc_cronet
${_gRPC_UPB_LIBRARIES} ${_gRPC_UPB_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
@ -20,7 +29,7 @@ index b535f10..0fcb682 100644
) )
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_cronet "-framework CoreFoundation") target_link_libraries(grpc_cronet "-framework CoreFoundation")
@@ -2283,7 +2283,7 @@ target_link_libraries(grpc_test_util @@ -2670,7 +2670,7 @@ target_link_libraries(grpc_test_util
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
grpc grpc
@ -29,7 +38,7 @@ index b535f10..0fcb682 100644
) )
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_test_util "-framework CoreFoundation") target_link_libraries(grpc_test_util "-framework CoreFoundation")
@@ -2626,7 +2626,7 @@ target_link_libraries(grpc_test_util_unsecure @@ -3013,7 +3013,7 @@ target_link_libraries(grpc_test_util_unsecure
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
grpc_unsecure grpc_unsecure
@ -38,7 +47,7 @@ index b535f10..0fcb682 100644
) )
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation") target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation")
@@ -3017,7 +3017,7 @@ target_link_libraries(grpc_unsecure @@ -3404,7 +3404,7 @@ target_link_libraries(grpc_unsecure
${_gRPC_UPB_LIBRARIES} ${_gRPC_UPB_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
@ -47,7 +56,7 @@ index b535f10..0fcb682 100644
) )
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_unsecure "-framework CoreFoundation") target_link_libraries(grpc_unsecure "-framework CoreFoundation")
@@ -3553,7 +3553,7 @@ target_link_libraries(grpc++ @@ -3743,7 +3743,7 @@ target_link_libraries(grpc++
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
grpc grpc
gpr gpr
@ -56,7 +65,16 @@ index b535f10..0fcb682 100644
) )
foreach(_hdr foreach(_hdr
@@ -4817,7 +4817,7 @@ target_link_libraries(grpc++_unsecure @@ -4070,7 +4070,7 @@ target_link_libraries(grpc++_alts
${_gRPC_ALLTARGETS_LIBRARIES}
grpc++
gpr
- upb
+ ${_gRPC_UPB_LIBRARIES}
)
foreach(_hdr
@@ -4876,7 +4876,7 @@ target_link_libraries(grpc++_unsecure
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
gpr gpr
grpc_unsecure grpc_unsecure
@ -65,8 +83,8 @@ index b535f10..0fcb682 100644
) )
foreach(_hdr foreach(_hdr
@@ -5848,7 +5848,7 @@ if(gRPC_INSTALL) @@ -5898,7 +5898,7 @@ target_link_libraries(grpc_csharp_ext
endif()
endif() endif()
- -
@ -74,7 +92,7 @@ index b535f10..0fcb682 100644
add_library(upb add_library(upb
third_party/upb/upb/decode.c third_party/upb/upb/decode.c
third_party/upb/upb/encode.c third_party/upb/upb/encode.c
@@ -5888,10 +5888,10 @@ target_include_directories(upb @@ -5938,10 +5938,10 @@ target_include_directories(upb
target_link_libraries(upb target_link_libraries(upb
${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES}
) )
@ -88,13 +106,13 @@ index b535f10..0fcb682 100644
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
index 504d5a7..e2a3122 100644 index 5bfa73c..8a867df 100644
--- a/cmake/gRPCConfig.cmake.in --- a/cmake/gRPCConfig.cmake.in
+++ b/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in
@@ -3,6 +3,7 @@ @@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
@_gRPC_FIND_PROTOBUF@
@_gRPC_FIND_SSL@ @_gRPC_FIND_SSL@
@_gRPC_FIND_CARES@ @_gRPC_FIND_CARES@
@_gRPC_FIND_ABSL@
+find_package(upb CONFIG) +find_package(upb CONFIG)
# Targets # Targets

View File

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

View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc REPO grpc/grpc
REF v1.26.0 REF v1.27.1
SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb SHA512 00a5e1e0f94e441b3406f821943d1775a7ab0580fd22d604ba29f56dc424ccc8f27c476077e39f24ddd7f1bada4eba9a38456fb4ac546e27ae239f43e431d988
HEAD_REF master HEAD_REF master
PATCHES PATCHES
00001-fix-uwp.patch 00001-fix-uwp.patch
@ -14,7 +14,6 @@ vcpkg_from_github(
00003-undef-base64-macro.patch 00003-undef-base64-macro.patch
00004-link-gdi32-on-windows.patch 00004-link-gdi32-on-windows.patch
00005-fix-uwp-error.patch 00005-fix-uwp-error.patch
00006-crypt32.patch
00009-use-system-upb.patch 00009-use-system-upb.patch
) )
@ -44,6 +43,7 @@ vcpkg_configure_cmake(
-DgRPC_ZLIB_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
-DgRPC_SSL_PROVIDER=package -DgRPC_SSL_PROVIDER=package
-DgRPC_PROTOBUF_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
-DgRPC_ABSL_PROVIDER=package
-DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
-DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER} -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER}
-DgRPC_GFLAGS_PROVIDER=none -DgRPC_GFLAGS_PROVIDER=none