3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[grpc] update to 1.44.0 (#23591)

Browse Source 
* [grpc] update to 1.44.0

* update version

* update patch EOL

* overwrite version

* update patch

* update version

* fix uwp-build

* overwrite version
This commit is contained in:
Frank 2022-03-22 04:18:01 +08:00 committed by GitHub
parent a7f4e7bf98
commit 470620d23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1911144984..8f78306f77 100644
index 7a97604..4967c4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,6 +181,9 @@ if(UNIX)
@@ -215,6 +215,9 @@ if(UNIX)
endif()
if(WIN32)
set(_gRPC_PLATFORM_WINDOWS ON)
@ -12,17 +12,17 @@ index 1911144984..8f78306f77 100644
endif()
# Use C99 standard
@@ -219,6 +222,9 @@ if(MSVC)
@@ -259,6 +262,9 @@ if(MSVC)
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
# TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
+ if(_gRPC_PLATFORM_UWP)
+ add_definitions(-DGRPC_ARES=0)
+ endif()
# Silences thousands of trucation warnings
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
endif()
if (MINGW)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
# ``.proto`` files
#
function(protobuf_generate_grpc_cpp)
@ -33,7 +33,7 @@ index 1911144984..8f78306f77 100644
if(NOT ARGN)
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
return()
@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
endif ()
@ -41,7 +41,7 @@ index 1911144984..8f78306f77 100644
add_custom_target(plugins
DEPENDS ${_gRPC_PLUGIN_LIST}
)
@@ -376,6 +387,7 @@ add_custom_target(tools_cxx
@@ -424,6 +435,7 @@ add_custom_target(tools_cxx
add_custom_target(tools
DEPENDS tools_c tools_cxx)
@ -49,21 +49,8 @@ index 1911144984..8f78306f77 100644
protobuf_generate_grpc_cpp(
src/proto/grpc/channelz/channelz.proto
diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
index dbe84e3466..cda40b6435 100644
--- a/src/core/lib/iomgr/resource_quota.cc
+++ b/src/core/lib/iomgr/resource_quota.cc
@@ -945,7 +945,7 @@ bool grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
gpr_mu_lock(&resource_user->mu);
grpc_resource_quota* resource_quota = resource_user->resource_quota;
- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size);
+ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size));
GPR_ASSERT(prior >= static_cast<long>(size));
bool was_zero_or_negative = resource_user->free_pool <= 0;
resource_user->free_pool += static_cast<int64_t>(size);
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
index 59432cff36..fed574d5bc 100644
index 5d2bdc1..e9870c2 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
@@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; }

8
ports/grpc/00003-undef-base64-macro.patch
View File

@ -1,13 +1,13 @@
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index 99a32980aa..f55db67113 100644
index 5d74ec2..89494b5 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -97,6 +97,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
refcount, &refcount->slice_refcount);
@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
: nullptr);
}
+#undef move64
+
static void move64(uint64_t* from, uint64_t* to) {
static void move64bits(uint64_t* from, uint64_t* to) {
*to += *from;
*from = 0;

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

@ -1,12 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e09f8fcc1e..ec1714687e 100644
index 14514b7..497470c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,7 @@ elseif(UNIX)
endif()
@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake)
include(cmake/zlib.cmake)
if(WIN32)
- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32)
- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32)
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
endif()

13
ports/grpc/00006-fix-uwp-error.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
index 18abbda..9789983 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
@@ -1052,7 +1052,7 @@ class HPackParser::Parser {
private:
void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) {
- const char* type;
+ const char* type = nullptr;
switch (log_info_.type) {
case LogInfo::kHeaders:
type = "HDR";

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

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae06ea3..8b64438 100644
index 497470c..9c07732 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2180,6 +2180,8 @@ target_link_libraries(grpc
@@ -2196,6 +2196,8 @@ target_link_libraries(grpc
${_gRPC_UPB_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
absl::flat_hash_map
@ -10,8 +10,8 @@ index ae06ea3..8b64438 100644
+ absl::synchronization
absl::inlined_vector
absl::bind_front
absl::statusor
@@ -2733,6 +2735,8 @@ target_link_libraries(grpc_unsecure
absl::hash
@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure
${_gRPC_UPB_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
absl::flat_hash_map
@ -21,7 +21,7 @@ index ae06ea3..8b64438 100644
absl::bind_front
absl::statusor
diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
index c89ba26..68ae4fd 100644
index c89ba26..81212b9 100644
--- a/cmake/abseil-cpp.cmake
+++ b/cmake/abseil-cpp.cmake
@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")
@ -31,4 +31,3 @@ index c89ba26..68ae4fd 100644
+ if (gRPC_ABSL_SYNC_ENABLE)
+ add_definitions(-DGPR_ABSEIL_SYNC=1)
+ endif()
\ No newline at end of file

13
ports/grpc/00012-fix-use-cxx17.patch
View File

@ -1,17 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4573027..4615602 100644
index 9c07732..54b4b23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,12 @@ include(cmake/upb.cmake)
@@ -321,6 +321,11 @@ include(cmake/ssl.cmake)
include(cmake/upb.cmake)
include(cmake/xxhash.cmake)
include(cmake/zlib.cmake)
+
+if (ABSL_USE_CXX17)
+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
+ set(CMAKE_CXX_STANDARD 17)
+endif()
+
if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
elseif(_gRPC_PLATFORM_ANDROID)
if(WIN32)
set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)

6
ports/grpc/00014-pkgconfig-upbdefs.patch
View File

@ -1,11 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7d677c..d527ff4 100644
index 54b4b23..83fab3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17705,7 +17705,7 @@ generate_pkgconfig(
@@ -17276,7 +17276,7 @@ generate_pkgconfig(
"high performance general RPC framework"
"${gRPC_CORE_VERSION}"
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
+ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz"
""

5
ports/grpc/portfile.cmake
View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF fc662b7964384b701af5bd3ce6994d2180080eb4 # v1.41.0
SHA512 ebb534b5d55f1a84c5ee2ea75f2ef871819d278966dec2610877c2f8ddd87bae80a63cbab0393fb37b81844f261327848821ac641b55963583288e6ec3b94e62
REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0
SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d
HEAD_REF master
PATCHES
00001-fix-uwp.patch
@ -14,6 +14,7 @@ vcpkg_from_github(
00003-undef-base64-macro.patch
00004-link-gdi32-on-windows.patch
00005-fix-uwp-error.patch
00006-fix-uwp-error.patch
00009-use-system-upb.patch
00010-add-feature-absl-sync.patch
00011-fix-csharp_plugin.patch

2
ports/grpc/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "grpc",
"version-semver": "1.41.0",
"version-semver": "1.44.0",
"description": "An RPC library and framework",
"homepage": "https://github.com/grpc/grpc",
"dependencies": [

2
versions/baseline.json
View File

@ -2617,7 +2617,7 @@
"port-version": 0
},
"grpc": {
"baseline": "1.41.0",
"baseline": "1.44.0",
"port-version": 0
},
"grppi": {

5
versions/g-/grpc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "489c160e47ae99de58a438f93714ecbb008df330",
"version-semver": "1.44.0",
"port-version": 0
},
{
"git-tree": "5e3795bf43afe5243e47e18ac66a28bc722207f5",
"version-semver": "1.41.0",