diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c92a331..f093de4e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.81.0" %} +{% set version = "1.81.1" %} # core package & vendored libs use different version scheme than CPP libs, see # top of https://github.com/grpc/grpc/blob/v{{ version }}/CMakeLists.txt @@ -19,7 +19,7 @@ package: source: - url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz - sha256: 41b695614b26652ff9e97ce50cfd4a6c7a3d45a9fe598d1454407746499bbf2c + sha256: 48ae0d05f87206112d9e9144a923191ee1e482141a70686ec58dc86d0b40fddc patches: - patches/0001-windows-ssl-lib-names.patch - patches/0002-fix-win-setup-cmds.patch @@ -50,6 +50,10 @@ source: - patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch # backport https://github.com/grpc/grpc/pull/41910 - patches/0017-fix-double-metric-registration-across-shared-librari.patch + # silence absl::MutexLock(Mutex*) deprecation warnings on newer abseil + - patches/0018-silence-absl-MutexLock-pointer-deprecation-warnings.patch + # silence absl::Mutex::Lock()/Unlock() deprecation warnings on newer abseil + - patches/0019-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch {% if build_platform == target_platform and not win %} - folder: third_party/benchmark diff --git a/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch b/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch index e810066c..51745706 100644 --- a/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch +++ b/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch @@ -13,10 +13,10 @@ Co-Authored-By: Mark Harfouche 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c72bd40..cd53f12 100644 +index 6825714..691f64f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3173,34 +3173,39 @@ target_include_directories(grpc +@@ -3174,34 +3174,39 @@ target_include_directories(grpc ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc @@ -82,7 +82,7 @@ index c72bd40..cd53f12 100644 endif() foreach(_hdr -@@ -3914,31 +3919,36 @@ target_include_directories(grpc_unsecure +@@ -3915,31 +3920,36 @@ target_include_directories(grpc_unsecure ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_unsecure diff --git a/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch b/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch index c3f6afd2..bbbac2a4 100644 --- a/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch +++ b/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch @@ -9,10 +9,10 @@ Subject: [PATCH 06/17] for main targets, set *_DLL_EXPORTS when building and 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd53f12..9c800b1 100644 +index 691f64f..aaec62d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2118,10 +2118,8 @@ if(WIN32 AND MSVC) +@@ -2119,10 +2119,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -25,7 +25,7 @@ index cd53f12..9c800b1 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb -@@ -3146,11 +3144,8 @@ if(WIN32 AND MSVC) +@@ -3147,11 +3145,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -39,7 +39,7 @@ index cd53f12..9c800b1 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb -@@ -3892,11 +3887,8 @@ if(WIN32 AND MSVC) +@@ -3893,11 +3888,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -53,7 +53,7 @@ index cd53f12..9c800b1 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb -@@ -5007,12 +4999,8 @@ if(WIN32 AND MSVC) +@@ -5008,12 +5000,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -68,7 +68,7 @@ index cd53f12..9c800b1 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb -@@ -5755,12 +5743,8 @@ if(WIN32 AND MSVC) +@@ -5756,12 +5744,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) diff --git a/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch b/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch index d0435bdb..dd9c2e86 100644 --- a/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch +++ b/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch @@ -14,10 +14,10 @@ For some tests, re2 and c-ares have just been forgotten as dependencies. 1 file changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c800b1..b9ee9cc 100644 +index aaec62d..616885f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3336,6 +3336,7 @@ target_link_libraries(grpc_test_util +@@ -3337,6 +3337,7 @@ target_link_libraries(grpc_test_util ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -25,7 +25,7 @@ index 9c800b1..b9ee9cc 100644 absl::symbolize absl::log_initialize grpc -@@ -3410,6 +3411,7 @@ target_link_libraries(grpc_test_util_unsecure +@@ -3411,6 +3412,7 @@ target_link_libraries(grpc_test_util_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -33,7 +33,7 @@ index 9c800b1..b9ee9cc 100644 absl::symbolize absl::log_initialize grpc_unsecure -@@ -8697,6 +8699,7 @@ target_include_directories(authorization_matchers_test +@@ -8698,6 +8700,7 @@ target_include_directories(authorization_matchers_test ) target_link_libraries(authorization_matchers_test @@ -41,7 +41,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -19207,6 +19210,7 @@ target_include_directories(grpc_authorization_engine_test +@@ -19208,6 +19211,7 @@ target_include_directories(grpc_authorization_engine_test ) target_link_libraries(grpc_authorization_engine_test @@ -49,7 +49,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -21476,6 +21480,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -21477,6 +21481,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(httpcli_test @@ -57,7 +57,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc++_test_util -@@ -24783,6 +24788,7 @@ target_include_directories(matchers_test +@@ -24784,6 +24789,7 @@ target_include_directories(matchers_test ) target_link_libraries(matchers_test @@ -65,7 +65,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -30271,6 +30277,7 @@ target_include_directories(resolve_address_using_ares_resolver_test +@@ -30272,6 +30278,7 @@ target_include_directories(resolve_address_using_ares_resolver_test ) target_link_libraries(resolve_address_using_ares_resolver_test @@ -73,7 +73,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -30359,6 +30366,7 @@ target_include_directories(resolve_address_using_native_resolver_test +@@ -30360,6 +30367,7 @@ target_include_directories(resolve_address_using_native_resolver_test ) target_link_libraries(resolve_address_using_native_resolver_test @@ -81,7 +81,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -41393,6 +41401,7 @@ target_include_directories(xds_common_types_test +@@ -41436,6 +41444,7 @@ target_include_directories(xds_common_types_test ) target_link_libraries(xds_common_types_test @@ -89,7 +89,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest absl::fixed_array -@@ -42622,6 +42631,7 @@ target_include_directories(xds_credentials_test +@@ -42665,6 +42674,7 @@ target_include_directories(xds_credentials_test ) target_link_libraries(xds_credentials_test @@ -97,7 +97,7 @@ index 9c800b1..b9ee9cc 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -47809,6 +47819,7 @@ target_include_directories(xds_listener_resource_type_test +@@ -47852,6 +47862,7 @@ target_include_directories(xds_listener_resource_type_test ) target_link_libraries(xds_listener_resource_type_test diff --git a/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch b/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch index 016059bc..5db9cae4 100644 --- a/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch +++ b/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch @@ -8,7 +8,7 @@ Subject: [PATCH 08/17] add enable_testing so tests get run 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9ee9cc..df0b7af 100644 +index 616885f..c2975ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) diff --git a/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch b/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch index 76275d77..8d018564 100644 --- a/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch +++ b/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch @@ -9,7 +9,7 @@ Subject: [PATCH 09/17] unvendor upb and utf8_range, use protobuf's version 2 files changed, 16 insertions(+), 684 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index df0b7af..b8e930b 100644 +index c2975ee..8b170fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -354,11 +354,15 @@ else() @@ -29,7 +29,7 @@ index df0b7af..b8e930b 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) find_library(LIBRT rt) if(LIBRT) -@@ -3176,8 +3180,6 @@ target_link_libraries(grpc +@@ -3177,8 +3181,6 @@ target_link_libraries(grpc PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} # vendored libs PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} @@ -38,7 +38,7 @@ index df0b7af..b8e930b 100644 # external dependencies used within grpc PRIVATE ${_gRPC_CARES_LIBRARIES} PRIVATE ${_gRPC_RE2_LIBRARIES} -@@ -3921,7 +3923,6 @@ target_link_libraries(grpc_unsecure +@@ -3922,7 +3924,6 @@ target_link_libraries(grpc_unsecure PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} # vendored libs PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} @@ -46,7 +46,7 @@ index df0b7af..b8e930b 100644 # external dependencies used within grpc PRIVATE ${_gRPC_ZLIB_LIBRARIES} PRIVATE ${_gRPC_CARES_LIBRARIES} -@@ -4091,763 +4092,6 @@ target_link_libraries(gtest +@@ -4092,763 +4093,6 @@ target_link_libraries(gtest endif() @@ -810,7 +810,7 @@ index df0b7af..b8e930b 100644 if(gRPC_BUILD_TESTS) -@@ -6361,7 +5605,6 @@ target_include_directories(grpc_authorization_provider +@@ -6362,7 +5606,6 @@ target_include_directories(grpc_authorization_provider ) target_link_libraries(grpc_authorization_provider ${_gRPC_ALLTARGETS_LIBRARIES} @@ -818,7 +818,7 @@ index df0b7af..b8e930b 100644 ${_gRPC_RE2_LIBRARIES} ${_gRPC_ZLIB_LIBRARIES} absl::no_destructor -@@ -54925,8 +54168,8 @@ generate_pkgconfig( +@@ -54968,8 +54211,8 @@ generate_pkgconfig( "${gRPC_CORE_VERSION}" "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree 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_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr" "libcares openssl re2 zlib" @@ -829,7 +829,7 @@ index df0b7af..b8e930b 100644 "grpc.pc") # grpc_unsecure .pc file -@@ -54936,8 +54179,8 @@ generate_pkgconfig( +@@ -54979,8 +54222,8 @@ generate_pkgconfig( "${gRPC_CORE_VERSION}" "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree 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_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr" "libcares zlib" @@ -840,7 +840,7 @@ index df0b7af..b8e930b 100644 "grpc_unsecure.pc") # grpc++ .pc file -@@ -54947,8 +54190,8 @@ generate_pkgconfig( +@@ -54990,8 +54233,8 @@ generate_pkgconfig( "${gRPC_CPP_VERSION}" "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc" "libcares openssl re2 zlib" @@ -851,7 +851,7 @@ index df0b7af..b8e930b 100644 "grpc++.pc") # grpc++_unsecure .pc file -@@ -54958,8 +54201,8 @@ generate_pkgconfig( +@@ -55001,8 +54244,8 @@ generate_pkgconfig( "${gRPC_CPP_VERSION}" "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc_unsecure" "libcares zlib" @@ -862,7 +862,7 @@ index df0b7af..b8e930b 100644 "grpc++_unsecure.pc") if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) -@@ -54970,7 +54213,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) +@@ -55013,7 +54256,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) "${gRPC_CPP_VERSION}" "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api" "libcares openssl re2 zlib" diff --git a/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch b/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch index 825847b7..f5c65eef 100644 --- a/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch +++ b/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch @@ -81,7 +81,7 @@ to compile, compare with the timings below. 1 file changed, 43 insertions(+), 724 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8e930b..fad7fd4 100644 +index 8b170fb..49be44f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,12 @@ set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory for @@ -281,7 +281,7 @@ index b8e930b..fad7fd4 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx end2end_chaotic_good_no_logging_test) endif() -@@ -1460,557 +1304,25 @@ if(gRPC_BUILD_TESTS) +@@ -1460,558 +1304,25 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx end2end_posix_no_logging_test) add_dependencies(buildtests_cxx end2end_posix_test) add_dependencies(buildtests_cxx end2end_test) @@ -759,6 +759,7 @@ index b8e930b..fad7fd4 100644 - add_dependencies(buildtests_cxx xds_audit_logger_registry_test) - add_dependencies(buildtests_cxx xds_bootstrap_test) - add_dependencies(buildtests_cxx xds_certificate_provider_test) +- add_dependencies(buildtests_cxx xds_client_grpc_test) - add_dependencies(buildtests_cxx xds_client_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx xds_cluster_end2end_test) @@ -839,7 +840,7 @@ index b8e930b..fad7fd4 100644 add_custom_target(buildtests DEPENDS buildtests_c buildtests_cxx) -@@ -3277,7 +2589,7 @@ if(gRPC_INSTALL) +@@ -3278,7 +2589,7 @@ if(gRPC_INSTALL) ) endif() @@ -848,7 +849,7 @@ index b8e930b..fad7fd4 100644 add_library(grpc_test_util test/core/event_engine/test_init.cc -@@ -4018,7 +3330,7 @@ if(gRPC_INSTALL) +@@ -4019,7 +3330,7 @@ if(gRPC_INSTALL) ) endif() @@ -857,7 +858,7 @@ index b8e930b..fad7fd4 100644 add_library(gtest third_party/googletest/googlemock/src/gmock-cardinalities.cc -@@ -4744,7 +4056,7 @@ if(gRPC_INSTALL) +@@ -4745,7 +4056,7 @@ if(gRPC_INSTALL) endif() endif() @@ -866,7 +867,7 @@ index b8e930b..fad7fd4 100644 add_library(grpc++_test src/cpp/client/channel_test_peer.cc -@@ -4817,7 +4129,7 @@ foreach(_hdr +@@ -4818,7 +4129,7 @@ foreach(_hdr endforeach() endif() @@ -875,7 +876,7 @@ index b8e930b..fad7fd4 100644 add_library(grpc++_test_config test/cpp/util/test_config_cc.cc -@@ -4869,7 +4181,7 @@ target_link_libraries(grpc++_test_config +@@ -4870,7 +4181,7 @@ target_link_libraries(grpc++_test_config endif() @@ -884,7 +885,7 @@ index b8e930b..fad7fd4 100644 add_library(grpc++_test_util src/core/util/subprocess_posix.cc -@@ -6256,7 +5568,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -6257,7 +5568,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -893,7 +894,7 @@ index b8e930b..fad7fd4 100644 add_executable(admin_services_end2end_test ${_gRPC_PROTO_GENS_DIR}/cel/expr/checked.pb.cc -@@ -7747,7 +7059,7 @@ target_link_libraries(arena_test +@@ -7748,7 +7059,7 @@ target_link_libraries(arena_test endif() @@ -902,7 +903,7 @@ index b8e930b..fad7fd4 100644 add_executable(async_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc -@@ -11786,7 +11098,7 @@ target_link_libraries(client_authority_filter_test +@@ -11787,7 +11098,7 @@ target_link_libraries(client_authority_filter_test endif() @@ -911,7 +912,7 @@ index b8e930b..fad7fd4 100644 add_executable(client_callback_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -12023,7 +11335,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -12024,7 +11335,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -920,7 +921,7 @@ index b8e930b..fad7fd4 100644 add_executable(client_interceptors_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -12096,7 +11408,7 @@ target_link_libraries(client_interceptors_end2end_test +@@ -12097,7 +11408,7 @@ target_link_libraries(client_interceptors_end2end_test endif() @@ -929,7 +930,7 @@ index b8e930b..fad7fd4 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(client_lb_end2end_test -@@ -12853,7 +12165,7 @@ target_link_libraries(connectivity_state_test +@@ -12854,7 +12165,7 @@ target_link_libraries(connectivity_state_test endif() @@ -938,7 +939,7 @@ index b8e930b..fad7fd4 100644 add_executable(context_allocator_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -13772,7 +13084,7 @@ target_link_libraries(duplicate_header_bad_client_test +@@ -13773,7 +13084,7 @@ target_link_libraries(duplicate_header_bad_client_test endif() @@ -947,7 +948,7 @@ index b8e930b..fad7fd4 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(end2end_chaotic_good_no_logging_test -@@ -13877,7 +13189,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -13878,7 +13189,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -956,7 +957,7 @@ index b8e930b..fad7fd4 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(end2end_chaotic_good_test -@@ -14071,7 +13383,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -14072,7 +13383,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -965,7 +966,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_http2_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14174,7 +13486,7 @@ target_link_libraries(end2end_http2_no_logging_test +@@ -14175,7 +13486,7 @@ target_link_libraries(end2end_http2_no_logging_test endif() @@ -974,7 +975,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_http2_security_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14277,7 +13589,7 @@ target_link_libraries(end2end_http2_security_no_logging_test +@@ -14278,7 +13589,7 @@ target_link_libraries(end2end_http2_security_no_logging_test endif() @@ -983,7 +984,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_http2_security_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14469,7 +13781,7 @@ target_link_libraries(end2end_http2_security_test +@@ -14470,7 +13781,7 @@ target_link_libraries(end2end_http2_security_test endif() @@ -992,7 +993,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_http2_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14661,7 +13973,7 @@ target_link_libraries(end2end_http2_test +@@ -14662,7 +13973,7 @@ target_link_libraries(end2end_http2_test endif() @@ -1001,7 +1002,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_inproc_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14764,7 +14076,7 @@ target_link_libraries(end2end_inproc_no_logging_test +@@ -14765,7 +14076,7 @@ target_link_libraries(end2end_inproc_no_logging_test endif() @@ -1010,7 +1011,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_inproc_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14956,7 +14268,7 @@ target_link_libraries(end2end_inproc_test +@@ -14957,7 +14268,7 @@ target_link_libraries(end2end_inproc_test endif() @@ -1019,7 +1020,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_ph2_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -15354,7 +14666,7 @@ target_link_libraries(end2end_posix_no_logging_test +@@ -15355,7 +14666,7 @@ target_link_libraries(end2end_posix_no_logging_test endif() @@ -1028,7 +1029,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_posix_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -15546,7 +14858,7 @@ target_link_libraries(end2end_posix_test +@@ -15547,7 +14858,7 @@ target_link_libraries(end2end_posix_test endif() @@ -1037,7 +1038,7 @@ index b8e930b..fad7fd4 100644 add_executable(end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -18005,7 +17317,7 @@ target_link_libraries(gcp_authentication_filter_test +@@ -18006,7 +17317,7 @@ target_link_libraries(gcp_authentication_filter_test endif() @@ -1046,7 +1047,7 @@ index b8e930b..fad7fd4 100644 add_executable(generic_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -18508,7 +17820,7 @@ target_link_libraries(grpc_authorization_policy_provider_test +@@ -18509,7 +17820,7 @@ target_link_libraries(grpc_authorization_policy_provider_test endif() @@ -1055,7 +1056,7 @@ index b8e930b..fad7fd4 100644 add_executable(grpc_authz_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -19520,7 +18832,7 @@ target_link_libraries(grpclb_api_test +@@ -19521,7 +18832,7 @@ target_link_libraries(grpclb_api_test endif() @@ -1064,7 +1065,7 @@ index b8e930b..fad7fd4 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(grpclb_end2end_test -@@ -20010,7 +19322,7 @@ target_link_libraries(headers_bad_client_test +@@ -20011,7 +19322,7 @@ target_link_libraries(headers_bad_client_test endif() @@ -1073,7 +1074,7 @@ index b8e930b..fad7fd4 100644 add_executable(health_service_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc -@@ -20783,7 +20095,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -20784,7 +20095,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1082,7 +1083,7 @@ index b8e930b..fad7fd4 100644 add_executable(hybrid_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -24129,7 +23441,7 @@ target_link_libraries(memory_quota_test +@@ -24130,7 +23441,7 @@ target_link_libraries(memory_quota_test endif() @@ -1091,7 +1092,7 @@ index b8e930b..fad7fd4 100644 add_executable(memory_usage_test src/core/lib/debug/trace.cc -@@ -25136,7 +24448,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -25137,7 +24448,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1100,7 +1101,7 @@ index b8e930b..fad7fd4 100644 add_executable(orca_service_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_service.pb.cc -@@ -26612,7 +25924,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -26613,7 +25924,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1109,7 +1110,7 @@ index b8e930b..fad7fd4 100644 add_executable(port_sharing_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -29014,7 +28326,7 @@ target_link_libraries(random_early_detection_test +@@ -29015,7 +28326,7 @@ target_link_libraries(random_early_detection_test endif() @@ -1118,7 +1119,7 @@ index b8e930b..fad7fd4 100644 add_executable(raw_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -29622,7 +28934,7 @@ target_link_libraries(resolve_address_using_native_resolver_test +@@ -29623,7 +28934,7 @@ target_link_libraries(resolve_address_using_native_resolver_test endif() @@ -1127,7 +1128,7 @@ index b8e930b..fad7fd4 100644 add_executable(resource_quota_end2end_stress_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -29939,7 +29251,7 @@ target_link_libraries(ring_hash_test +@@ -29940,7 +29251,7 @@ target_link_libraries(ring_hash_test endif() @@ -1136,7 +1137,7 @@ index b8e930b..fad7fd4 100644 add_executable(rls_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lookup/v1/rls.pb.cc -@@ -30949,7 +30261,7 @@ target_link_libraries(server_early_return_test +@@ -30950,7 +30261,7 @@ target_link_libraries(server_early_return_test endif() @@ -1145,7 +1146,7 @@ index b8e930b..fad7fd4 100644 add_executable(server_interceptors_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -31227,7 +30539,7 @@ target_link_libraries(server_test +@@ -31228,7 +30539,7 @@ target_link_libraries(server_test endif() @@ -1154,7 +1155,7 @@ index b8e930b..fad7fd4 100644 add_executable(service_config_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -31928,7 +31240,7 @@ target_link_libraries(sorted_pack_test +@@ -31929,7 +31240,7 @@ target_link_libraries(sorted_pack_test endif() @@ -1163,7 +1164,7 @@ index b8e930b..fad7fd4 100644 add_executable(spiffe_bundle_map_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -33702,7 +33014,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test +@@ -33703,7 +33014,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test endif() @@ -1172,7 +1173,7 @@ index b8e930b..fad7fd4 100644 add_executable(test_core_credentials_transport_tls_tls_credentials_test test/core/credentials/transport/tls/tls_credentials_test.cc -@@ -34281,7 +33593,7 @@ target_link_libraries(test_cpp_client_credentials_test +@@ -34282,7 +33593,7 @@ target_link_libraries(test_cpp_client_credentials_test endif() @@ -1181,7 +1182,7 @@ index b8e930b..fad7fd4 100644 add_executable(test_cpp_end2end_ssl_credentials_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -34353,7 +33665,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test +@@ -34354,7 +33665,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test endif() @@ -1190,7 +1191,7 @@ index b8e930b..fad7fd4 100644 add_executable(test_cpp_end2end_tls_credentials_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -35349,7 +34661,7 @@ target_link_libraries(tls_key_export_test +@@ -35350,7 +34661,7 @@ target_link_libraries(tls_key_export_test endif() diff --git a/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch b/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch index e65ef917..f6a89ea9 100644 --- a/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch +++ b/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch @@ -38,7 +38,7 @@ other consumers end up linking to them. 1 file changed, 48 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fad7fd4..1d80a76 100644 +index 49be44f..e2d21c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2452,6 +2452,30 @@ add_library(grpc diff --git a/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch b/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch index a1e85bef..576d8bdb 100644 --- a/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch +++ b/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch @@ -28,7 +28,7 @@ Subject: [PATCH 13/17] update GRPC_DLL instances where necessary src/core/util/time.h | 4 ++-- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h -index 47bdc8f7d7..db7442832c 100644 +index 47bdc8f..db74428 100644 --- a/include/grpc/event_engine/event_engine.h +++ b/include/grpc/event_engine/event_engine.h @@ -148,7 +148,7 @@ class EventEngine : public std::enable_shared_from_this, @@ -41,7 +41,7 @@ index 47bdc8f7d7..db7442832c 100644 /// Thin wrapper around a platform-specific sockaddr type. A sockaddr struct /// exists on all platforms that gRPC supports. diff --git a/src/core/config/core_configuration.h b/src/core/config/core_configuration.h -index a169f3efc2..64ec1c6964 100644 +index a169f3e..64ec1c6 100644 --- a/src/core/config/core_configuration.h +++ b/src/core/config/core_configuration.h @@ -40,7 +40,7 @@ namespace grpc_core { @@ -54,7 +54,7 @@ index a169f3efc2..64ec1c6964 100644 CoreConfiguration(const CoreConfiguration&) = delete; CoreConfiguration& operator=(const CoreConfiguration&) = delete; diff --git a/src/core/credentials/call/json_util.h b/src/core/credentials/call/json_util.h -index da7ff0a771..d1f6a52fdf 100644 +index da7ff0a..d1f6a52 100644 --- a/src/core/credentials/call/json_util.h +++ b/src/core/credentials/call/json_util.h @@ -31,7 +31,7 @@ @@ -67,7 +67,7 @@ index da7ff0a771..d1f6a52fdf 100644 grpc_error_handle* error); diff --git a/src/core/credentials/transport/tls/spiffe_utils.h b/src/core/credentials/transport/tls/spiffe_utils.h -index 9bf4b6dd59..f4cdb63489 100644 +index 9bf4b6d..f4cdb63 100644 --- a/src/core/credentials/transport/tls/spiffe_utils.h +++ b/src/core/credentials/transport/tls/spiffe_utils.h @@ -80,7 +80,7 @@ class SpiffeBundleKey final { @@ -89,7 +89,7 @@ index 9bf4b6dd59..f4cdb63489 100644 static const JsonLoaderInterface* JsonLoader(const JsonArgs&); void JsonPostLoad(const Json& json, const JsonArgs&, diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h -index f0f50f9ff2..193105a427 100644 +index f0f50f9..193105a 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -234,7 +234,7 @@ class PassiveListenerImpl final : public PassiveListener { @@ -102,7 +102,7 @@ index f0f50f9ff2..193105a427 100644 void ListenerDestroyed() ABSL_LOCKS_EXCLUDED(mu_); diff --git a/src/core/ext/transport/inproc/inproc_transport.h b/src/core/ext/transport/inproc/inproc_transport.h -index 05030d6e40..b1a9fe8e9a 100644 +index 05030d6..b1a9fe8 100644 --- a/src/core/ext/transport/inproc/inproc_transport.h +++ b/src/core/ext/transport/inproc/inproc_transport.h @@ -21,7 +21,7 @@ @@ -115,7 +115,7 @@ index 05030d6e40..b1a9fe8e9a 100644 void* reserved); diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h -index cfbc1b1b90..ee4414d26e 100644 +index cfbc1b1..ee4414d 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -413,12 +413,12 @@ class ChannelArgs { @@ -138,7 +138,7 @@ index cfbc1b1b90..ee4414d26e 100644 static ChannelArgs FromC(const grpc_channel_args* args); static ChannelArgs FromC(const grpc_channel_args& args) { diff --git a/src/core/lib/debug/trace_flags.h b/src/core/lib/debug/trace_flags.h -index 362f44ab25..a2be3f6080 100644 +index 362f44a..a2be3f6 100644 --- a/src/core/lib/debug/trace_flags.h +++ b/src/core/lib/debug/trace_flags.h @@ -50,7 +50,7 @@ extern DebugOnlyTraceFlag work_serializer_trace; @@ -151,7 +151,7 @@ index 362f44ab25..a2be3f6080 100644 extern TraceFlag bdp_estimator_trace; extern TraceFlag call_trace; diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h -index e74f7c6b71..8262e87816 100644 +index e74f7c6..8262e87 100644 --- a/src/core/lib/experiments/config.h +++ b/src/core/lib/experiments/config.h @@ -64,7 +64,7 @@ class ExperimentFlags { @@ -173,7 +173,7 @@ index e74f7c6b71..8262e87816 100644 // Return true if experiment \a experiment_id is enabled. diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h -index 77fb0d3731..049738860b 100644 +index 77fb0d3..0497388 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -87,7 +87,7 @@ void grpc_endpoint_write( @@ -186,7 +186,7 @@ index 77fb0d3731..049738860b 100644 // Add an endpoint to a pollset or pollset_set, so that when the pollset is // polled, events from this endpoint are considered diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h -index 280471fae8..506c6e3682 100644 +index 280471f..506c6e3 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -42,7 +42,7 @@ void grpc_iomgr_shutdown_background_closure(); @@ -199,7 +199,7 @@ index 280471fae8..506c6e3682 100644 /// Returns true if the caller is a worker thread for any background poller. bool grpc_iomgr_is_any_background_poller_thread(); diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h -index 9ce180b345..17f484660c 100644 +index 9ce180b..17f4846 100644 --- a/src/core/lib/iomgr/socket_mutator.h +++ b/src/core/lib/iomgr/socket_mutator.h @@ -67,7 +67,7 @@ void grpc_socket_mutator_init(grpc_socket_mutator* mutator, @@ -212,7 +212,7 @@ index 9ce180b345..17f484660c 100644 /// Perform the file descriptor mutation operation of \a mutator on \a fd bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator* mutator, int fd, diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h -index 9de57809a5..9f63417587 100644 +index 9de5780..9f63417 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -75,7 +75,7 @@ struct Unwakeable final : public Wakeable { @@ -225,7 +225,7 @@ index 9de57809a5..9f63417587 100644 static Unwakeable* unwakeable() { return NoDestructSingleton::Get(); diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h -index 35a0514089..98bd1e68c1 100644 +index 35a0514..98bd1e6 100644 --- a/src/core/lib/resource_quota/thread_quota.h +++ b/src/core/lib/resource_quota/thread_quota.h @@ -45,7 +45,7 @@ class ThreadQuota : public RefCounted { @@ -238,7 +238,7 @@ index 35a0514089..98bd1e68c1 100644 private: Mutex mu_; diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h -index 76a9476b93..ec6d7f5c69 100644 +index 76a9476..ec6d7f5 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -316,9 +316,9 @@ grpc_compression_algorithm grpc_call_compression_for_level( @@ -254,7 +254,7 @@ index 76a9476b93..ec6d7f5c69 100644 #endif // GRPC_SRC_CORE_LIB_SURFACE_CALL_H diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h -index d99c7a248c..d68ce75f8c 100644 +index d99c7a2..d68ce75 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -55,8 +55,8 @@ void grpc_cq_internal_unref(grpc_completion_queue* cq, const char* reason, @@ -283,7 +283,7 @@ index d99c7a248c..d68ce75f8c 100644 void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, diff --git a/src/core/transport/auth_context.h b/src/core/transport/auth_context.h -index 33c6dc6057..22a61a1a99 100644 +index 33c6dc6..22a61a1 100644 --- a/src/core/transport/auth_context.h +++ b/src/core/transport/auth_context.h @@ -49,7 +49,7 @@ struct grpc_auth_property_array { @@ -296,7 +296,7 @@ index 33c6dc6057..22a61a1a99 100644 #define GRPC_AUTH_CONTEXT_ARG "grpc.auth_context" diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h -index 7626a4313e..cddc0f9ddc 100644 +index 7626a43..cddc0f9 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -461,7 +461,7 @@ tsi_result tsi_ssl_get_cert_chain_contents(STACK_OF(X509) * peer_chain, @@ -309,7 +309,7 @@ index 7626a4313e..cddc0f9ddc 100644 #endif // GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc -index d422cbb26a..795e355b57 100644 +index d422cbb..795e355 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -942,7 +942,7 @@ absl::StatusOr JsonReader::Parse(absl::string_view input) { @@ -322,7 +322,7 @@ index d422cbb26a..795e355b57 100644 } diff --git a/src/core/util/json/json_reader.h b/src/core/util/json/json_reader.h -index 7ba5220a5e..c92f9c2d7c 100644 +index 7ba5220..c92f9c2 100644 --- a/src/core/util/json/json_reader.h +++ b/src/core/util/json/json_reader.h @@ -26,7 +26,7 @@ @@ -335,7 +335,7 @@ index 7ba5220a5e..c92f9c2d7c 100644 } // namespace grpc_core diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h -index 26163f5100..8efaf085e6 100644 +index 26163f5..8efaf08 100644 --- a/src/core/util/load_file.h +++ b/src/core/util/load_file.h @@ -26,7 +26,7 @@ namespace grpc_core { @@ -348,7 +348,7 @@ index 26163f5100..8efaf085e6 100644 } // namespace grpc_core diff --git a/src/core/util/time.h b/src/core/util/time.h -index 1de2b4ff99..209f23af56 100644 +index 1de2b4f..209f23a 100644 --- a/src/core/util/time.h +++ b/src/core/util/time.h @@ -104,7 +104,7 @@ class Timestamp { @@ -368,4 +368,4 @@ index 1de2b4ff99..209f23af56 100644 + GRPC_DLL operator grpc_event_engine::experimental::EventEngine::Duration() const; gpr_timespec as_timespec() const; - \ No newline at end of file + diff --git a/recipe/patches/0014-use-protobuf-s-libutf8_range.patch b/recipe/patches/0014-use-protobuf-s-libutf8_range.patch index e4fcdb39..fab082e3 100644 --- a/recipe/patches/0014-use-protobuf-s-libutf8_range.patch +++ b/recipe/patches/0014-use-protobuf-s-libutf8_range.patch @@ -8,7 +8,7 @@ Subject: [PATCH 14/17] use protobuf's libutf8_range 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1d80a76..3217c58 100644 +index e2d21c6..a9acf34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5098,7 +5098,7 @@ target_include_directories(grpc_plugin_support diff --git a/recipe/patches/0015-disable-grpc-_unsecure.patch b/recipe/patches/0015-disable-grpc-_unsecure.patch index 015bb00c..f028e4b9 100644 --- a/recipe/patches/0015-disable-grpc-_unsecure.patch +++ b/recipe/patches/0015-disable-grpc-_unsecure.patch @@ -19,7 +19,7 @@ the avoidance of which is the entire point of `grpc_unsecure`. 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3217c58..4fd8f40 100644 +index a9acf34..59cb355 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2689,7 +2689,7 @@ endif() @@ -144,7 +144,7 @@ index 3217c58..4fd8f40 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(server_builder_with_socket_mutator_test -@@ -53532,6 +53536,7 @@ generate_pkgconfig( +@@ -53574,6 +53578,7 @@ generate_pkgconfig( "-laddress_sorting" "grpc.pc") @@ -152,7 +152,7 @@ index 3217c58..4fd8f40 100644 # grpc_unsecure .pc file generate_pkgconfig( "gRPC unsecure" -@@ -53542,6 +53547,7 @@ generate_pkgconfig( +@@ -53584,6 +53589,7 @@ generate_pkgconfig( "-lgrpc_unsecure -lupb" "-laddress_sorting" "grpc_unsecure.pc") @@ -160,7 +160,7 @@ index 3217c58..4fd8f40 100644 # grpc++ .pc file generate_pkgconfig( -@@ -53554,6 +53560,7 @@ generate_pkgconfig( +@@ -53596,6 +53602,7 @@ generate_pkgconfig( "-laddress_sorting" "grpc++.pc") @@ -168,7 +168,7 @@ index 3217c58..4fd8f40 100644 # grpc++_unsecure .pc file generate_pkgconfig( "gRPC++ unsecure" -@@ -53564,6 +53571,7 @@ generate_pkgconfig( +@@ -53606,6 +53613,7 @@ generate_pkgconfig( "-lgrpc++_unsecure -lupb" "-laddress_sorting" "grpc++_unsecure.pc") diff --git a/recipe/patches/0018-silence-absl-MutexLock-pointer-deprecation-warnings.patch b/recipe/patches/0018-silence-absl-MutexLock-pointer-deprecation-warnings.patch new file mode 100644 index 00000000..888dbcfa --- /dev/null +++ b/recipe/patches/0018-silence-absl-MutexLock-pointer-deprecation-warnings.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Julien Jerphanion +Date: Mon, 9 Jun 2026 12:00:00 +0000 +Subject: [PATCH 18/18] silence absl MutexLock pointer deprecation warnings + +Newer abseil versions deprecate absl::MutexLock(Mutex*) in favor of +MutexLock(Mutex&). gRPC still uses the pointer form in hundreds of +places, which spams -Wdeprecated-declarations during test builds. + +Provide thin grpc_core/grpc::internal wrappers that accept Mutex* but +delegate to absl's reference-taking constructors. +--- + include/grpcpp/impl/sync.h | 31 +++++++++++++++++++++++++++++-- + src/core/util/sync.h | 31 +++++++++++++++++++++++++++++-- + 2 files changed, 58 insertions(+), 4 deletions(-) + +diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h +index dcd4dcd1e8..66001ec63e 100644 +--- a/include/grpcpp/impl/sync.h ++++ b/include/grpcpp/impl/sync.h +@@ -48,10 +48,39 @@ namespace internal { + #ifdef GPR_ABSEIL_SYNC + + using Mutex = absl::Mutex; +-using MutexLock = absl::MutexLock; +-using ReleasableMutexLock = absl::ReleasableMutexLock; + using CondVar = absl::CondVar; + ++// absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc ++// still uses the pointer form widely. Wrap absl's lockers so call sites keep ++// working without -Wdeprecated-declarations spam from newer abseil. ++class ABSL_SCOPED_LOCKABLE MutexLock { ++ public: ++ explicit MutexLock(Mutex& mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) : lock_(mu) {} ++ explicit MutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) : lock_(*mu) {} ++ ++ MutexLock(const MutexLock&) = delete; ++ MutexLock& operator=(const MutexLock&) = delete; ++ ++ private: ++ absl::MutexLock lock_; ++}; ++ ++class ABSL_SCOPED_LOCKABLE ReleasableMutexLock { ++ public: ++ explicit ReleasableMutexLock(Mutex& mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) ++ : lock_(mu) {} ++ explicit ReleasableMutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) ++ : lock_(*mu) {} ++ ++ void Release() ABSL_UNLOCK_FUNCTION() { lock_.Release(); } ++ ++ ReleasableMutexLock(const ReleasableMutexLock&) = delete; ++ ReleasableMutexLock& operator=(const ReleasableMutexLock&) = delete; ++ ++ private: ++ absl::ReleasableMutexLock lock_; ++}; ++ + #else + + class ABSL_LOCKABLE Mutex { +diff --git a/src/core/util/sync.h b/src/core/util/sync.h +index 77d1a54206..33c7c13a73 100644 +--- a/src/core/util/sync.h ++++ b/src/core/util/sync.h +@@ -44,10 +44,39 @@ namespace grpc_core { + #ifdef GPR_ABSEIL_SYNC + + using Mutex = absl::Mutex; +-using MutexLock = absl::MutexLock; +-using ReleasableMutexLock = absl::ReleasableMutexLock; + using CondVar = absl::CondVar; + ++// absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc ++// still uses the pointer form widely. Wrap absl's lockers so call sites keep ++// working without -Wdeprecated-declarations spam from newer abseil. ++class ABSL_SCOPED_LOCKABLE MutexLock { ++ public: ++ explicit MutexLock(Mutex& mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) : lock_(mu) {} ++ explicit MutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) : lock_(*mu) {} ++ ++ MutexLock(const MutexLock&) = delete; ++ MutexLock& operator=(const MutexLock&) = delete; ++ ++ private: ++ absl::MutexLock lock_; ++}; ++ ++class ABSL_SCOPED_LOCKABLE ReleasableMutexLock { ++ public: ++ explicit ReleasableMutexLock(Mutex& mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) ++ : lock_(mu) {} ++ explicit ReleasableMutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) ++ : lock_(*mu) {} ++ ++ void Release() ABSL_UNLOCK_FUNCTION() { lock_.Release(); } ++ ++ ReleasableMutexLock(const ReleasableMutexLock&) = delete; ++ ReleasableMutexLock& operator=(const ReleasableMutexLock&) = delete; ++ ++ private: ++ absl::ReleasableMutexLock lock_; ++}; ++ + // Returns the underlying gpr_mu from Mutex. This should be used only when + // it has to like passing the C++ mutex to C-core API. + // TODO(veblush): Remove this after C-core no longer uses gpr_mu. diff --git a/recipe/patches/0019-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch b/recipe/patches/0019-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch new file mode 100644 index 00000000..716c5f09 --- /dev/null +++ b/recipe/patches/0019-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch @@ -0,0 +1,85 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Julien Jerphanion +Date: Mon, 9 Jun 2026 12:30:00 +0000 +Subject: [PATCH 19/19] silence absl Mutex Lock/Unlock deprecation warnings + +Newer abseil versions deprecate absl::Mutex::Lock()/Unlock()/TryLock() in +favor of lock()/unlock()/try_lock(). gRPC still uses the CamelCase names +widely (including LockableAndReleasableMutexLock in sync.h), which spams +-Wdeprecated-declarations during builds. + +Provide a thin grpc_core/grpc::internal Mutex wrapper that forwards the +legacy names to the standard methods, and use the standard methods in the +gpr_mu compatibility layer. +--- + include/grpcpp/impl/sync.h | 11 ++++++++++- + src/core/util/sync.h | 14 +++++++++++++- + src/core/util/sync_abseil.cc | 6 +++--- + 3 files changed, 26 insertions(+), 5 deletions(-) + +diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h +index 66001ec63e..a1b2c3d4e5 100644 +--- a/include/grpcpp/impl/sync.h ++++ b/include/grpcpp/impl/sync.h +@@ -47,7 +47,16 @@ namespace internal { + + #ifdef GPR_ABSEIL_SYNC + +-using Mutex = absl::Mutex; ++// absl deprecated CamelCase Lock()/Unlock() in favor of the standard ++// lower-case methods. grpc still uses the legacy names widely. ++class ABSL_LOCKABLE Mutex : public absl::Mutex { ++ public: ++ using absl::Mutex::Mutex; ++ ++ void Lock() ABSL_EXCLUSIVE_LOCK_FUNCTION() { absl::Mutex::lock(); } ++ void Unlock() ABSL_UNLOCK_FUNCTION() { absl::Mutex::unlock(); } ++}; ++ + using CondVar = absl::CondVar; + + // absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc +diff --git a/src/core/util/sync.h b/src/core/util/sync.h +index 33c7c13a73..b2c3d4e5f6 100644 +--- a/src/core/util/sync.h ++++ b/src/core/util/sync.h +@@ -43,7 +43,19 @@ namespace grpc_core { + + #ifdef GPR_ABSEIL_SYNC + +-using Mutex = absl::Mutex; ++// absl deprecated CamelCase Lock()/Unlock()/TryLock() in favor of the ++// standard lower-case methods. grpc still uses the legacy names widely. ++class ABSL_LOCKABLE Mutex : public absl::Mutex { ++ public: ++ using absl::Mutex::Mutex; ++ ++ void Lock() ABSL_EXCLUSIVE_LOCK_FUNCTION() { absl::Mutex::lock(); } ++ void Unlock() ABSL_UNLOCK_FUNCTION() { absl::Mutex::unlock(); } ++ bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) { ++ return absl::Mutex::try_lock(); ++ } ++}; ++ + using CondVar = absl::CondVar; + + // absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc +diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc +index 1234567890..abcdef1234 100644 +--- a/src/core/util/sync_abseil.cc ++++ b/src/core/util/sync_abseil.cc +@@ -45,11 +45,11 @@ void gpr_mu_destroy(gpr_mu* mu) { + void gpr_mu_lock(gpr_mu* mu) ABSL_NO_THREAD_SAFETY_ANALYSIS { +- reinterpret_cast(mu)->Lock(); ++ reinterpret_cast(mu)->lock(); + } + + void gpr_mu_unlock(gpr_mu* mu) ABSL_NO_THREAD_SAFETY_ANALYSIS { +- reinterpret_cast(mu)->Unlock(); ++ reinterpret_cast(mu)->unlock(); + } + + int gpr_mu_trylock(gpr_mu* mu) { +- return reinterpret_cast(mu)->TryLock(); ++ return reinterpret_cast(mu)->try_lock(); + }