Skip to content

Commit 3b936a2

Browse files
committed
[vcpkg][grpc] update the vcpkg to 2025.01.13 and the grpc to 1.68.2.
1 parent ce04565 commit 3b936a2

14 files changed

+242
-277
lines changed

3rd-party/vcpkg

Submodule vcpkg updated 3470 files

3rd-party/vcpkg-ports/grpc/00003-undef-base64-macro.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index fce68b9..220f251 100644
3-
--- a/CMakeLists.txt
4-
+++ b/CMakeLists.txt
5-
@@ -432,7 +432,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds)
6-
endif()
7-
8-
if(WIN32)
9-
- set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32)
10-
+ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} wsock32 ws2_32 crypt32 gdi32)
11-
set(_gRPC_STATIC_WIN32 STATIC)
12-
endif()
13-
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 2f633092ae..43fa8f6d97 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -481,7 +481,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARC
6+
endif()
7+
8+
if(WIN32)
9+
- set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32)
10+
+ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} wsock32 ws2_32 crypt32 gdi32)
11+
set(_gRPC_STATIC_WIN32 STATIC)
12+
endif()
13+
Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
2-
index 31bf464..d1007e4 100644
3-
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
4-
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
5-
@@ -689,7 +689,7 @@ class HPackParser::Parser {
6-
}
7-
8-
void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) {
9-
- const char* type;
10-
+ const char* type = nullptr;
11-
switch (log_info_.type) {
12-
case LogInfo::kHeaders:
13-
type = "HDR";
14-
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
15-
index 6180ef1..a8e8110 100644
16-
--- a/src/core/lib/slice/slice.cc
17-
+++ b/src/core/lib/slice/slice.cc
18-
@@ -188,6 +188,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
19-
size_t len) {
20-
uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
21-
grpc_slice slice;
22-
+ memset(&slice, 0, sizeof(grpc_slice));
23-
if (len <= sizeof(slice.data.inlined.bytes)) {
24-
slice.refcount = nullptr;
25-
slice.data.inlined.length = len;
26-
@@ -206,7 +207,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
27-
}
28-
29-
grpc_slice grpc_slice_from_cpp_string(std::string str) {
30-
- grpc_slice slice;
31-
+ grpc_slice slice = { 0 };
32-
if (str.size() <= sizeof(slice.data.inlined.bytes)) {
33-
slice.refcount = nullptr;
34-
slice.data.inlined.length = str.size();
35-
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
36-
index 3dda49d..202caa5 100644
37-
--- a/src/core/lib/surface/server.cc
38-
+++ b/src/core/lib/surface/server.cc
39-
@@ -1057,7 +1057,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {
40-
FailCall(cq_idx, rc, GRPC_ERROR_CREATE("Server Shutdown"));
41-
return GRPC_CALL_OK;
42-
}
43-
- RequestMatcherInterface* rm;
44-
+ RequestMatcherInterface* rm = nullptr;
45-
switch (rc->type) {
46-
case RequestedCall::Type::BATCH_CALL:
47-
rm = unregistered_request_matcher_.get();
1+
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
2+
index 84b4e86279..4921002887 100644
3+
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
4+
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
5+
@@ -688,7 +688,7 @@ class HPackParser::Parser {
6+
}
7+
8+
void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) {
9+
- const char* type;
10+
+ const char* type = nullptr;
11+
switch (log_info_.type) {
12+
case LogInfo::kHeaders:
13+
type = "HDR";
14+
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
15+
index f2d49e0bf4..c86a75f1a3 100644
16+
--- a/src/core/lib/slice/slice.cc
17+
+++ b/src/core/lib/slice/slice.cc
18+
@@ -189,6 +189,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
19+
size_t len) {
20+
uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
21+
grpc_slice slice;
22+
+ memset(&slice, 0, sizeof(grpc_slice));
23+
if (len <= sizeof(slice.data.inlined.bytes)) {
24+
slice.refcount = nullptr;
25+
slice.data.inlined.length = len;
26+
@@ -207,7 +208,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
27+
}
28+
29+
grpc_slice grpc_slice_from_cpp_string(std::string str) {
30+
- grpc_slice slice;
31+
+ grpc_slice slice = { 0 };
32+
if (str.size() <= sizeof(slice.data.inlined.bytes)) {
33+
slice.refcount = nullptr;
34+
slice.data.inlined.length = str.size();
35+
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
36+
index c4796d6ae9..6a0289d180 100644
37+
--- a/src/core/server/server.cc
38+
+++ b/src/core/server/server.cc
39+
@@ -1284,7 +1284,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {
40+
FailCall(cq_idx, rc, GRPC_ERROR_CREATE("Server Shutdown"));
41+
return GRPC_CALL_OK;
42+
}
43+
- RequestMatcherInterface* rm;
44+
+ RequestMatcherInterface* rm = nullptr;
45+
switch (rc->type) {
46+
case RequestedCall::Type::BATCH_CALL:
47+
rm = unregistered_request_matcher_.get();
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index fc4b6a40a5..3e657e7405 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -4447,7 +4447,7 @@ if(gRPC_INSTALL)
6+
)
7+
endif()
8+
9+
-
10+
+if(0)
11+
add_library(utf8_range_lib
12+
third_party/utf8_range/utf8_range.c
13+
)
14+
@@ -4497,6 +4497,7 @@ if(gRPC_INSTALL)
15+
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
16+
)
17+
endif()
18+
+endif()
19+
20+
if(gRPC_BUILD_TESTS)
21+
22+
@@ -40772,9 +40773,9 @@ generate_pkgconfig(
23+
"high performance general RPC framework"
24+
"${gRPC_CORE_VERSION}"
25+
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
26+
- "libcares openssl re2 zlib"
27+
+ "libcares openssl re2 zlib utf8_range"
28+
"-lgrpc"
29+
- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
30+
+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
31+
"grpc.pc")
32+
33+
# grpc_unsecure .pc file
34+
@@ -40783,9 +40784,9 @@ generate_pkgconfig(
35+
"high performance general RPC framework without SSL"
36+
"${gRPC_CORE_VERSION}"
37+
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
38+
- "libcares zlib"
39+
+ "libcares zlib utf8_range"
40+
"-lgrpc_unsecure"
41+
- "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
42+
+ "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
43+
"grpc_unsecure.pc")
44+
45+
# grpc++ .pc file
46+
@@ -40794,9 +40795,9 @@ generate_pkgconfig(
47+
"C++ wrapper for gRPC"
48+
"${gRPC_CPP_VERSION}"
49+
"absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc"
50+
- "libcares openssl re2 zlib"
51+
+ "libcares openssl re2 zlib utf8_range"
52+
"-lgrpc++"
53+
- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
54+
+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
55+
"grpc++.pc")
56+
57+
# grpc++_unsecure .pc file
58+
@@ -40805,18 +40806,20 @@ generate_pkgconfig(
59+
"C++ wrapper for gRPC without SSL"
60+
"${gRPC_CPP_VERSION}"
61+
"absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure"
62+
- "libcares zlib"
63+
+ "libcares zlib utf8_range"
64+
"-lgrpc++_unsecure"
65+
- "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
66+
+ "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
67+
"grpc++_unsecure.pc")
68+
69+
+if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
70+
# grpcpp_otel_plugin .pc file
71+
generate_pkgconfig(
72+
"gRPC++ OpenTelemetry Plugin"
73+
"OpenTelemetry Plugin for gRPC C++"
74+
"${gRPC_CPP_VERSION}"
75+
"absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc grpc++ opentelemetry_api"
76+
- "libcares openssl re2 zlib"
77+
+ "libcares openssl re2 zlib utf8_range"
78+
"-lgrpcpp_otel_plugin"
79+
- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
80+
+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
81+
"grpcpp_otel_plugin.pc")
82+
+endif()
83+
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
84+
index d552e0bb4e..5751f503ba 100644
85+
--- a/cmake/gRPCConfig.cmake.in
86+
+++ b/cmake/gRPCConfig.cmake.in
87+
@@ -9,6 +9,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
88+
@_gRPC_FIND_ABSL@
89+
@_gRPC_FIND_RE2@
90+
@_gRPC_FIND_OPENTELEMETRY@
91+
+@_gRPC_FIND_UTF8_RANGE@
92+
93+
# Targets
94+
include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
95+
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
96+
index 9156e5f48f..d3d9ee410e 100644
97+
--- a/cmake/upb.cmake
98+
+++ b/cmake/upb.cmake
99+
@@ -14,7 +14,9 @@
100+
101+
set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
102+
103+
-set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range")
104+
+set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
105+
set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen")
106+
107+
set(_gRPC_UPB_LIBRARIES upb)
108+
+set(_gRPC_FIND_UTF8_RANGE "find_dependency(utf8_range CONFIG)")
109+
+add_library(utf8_range_lib ALIAS utf8_range::utf8_range)
110+
\ No newline at end of file

3rd-party/vcpkg-ports/grpc/00009-use-system-upb.patch

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)