From c124088bea142772241c558367e17fd75b6baef1 Mon Sep 17 00:00:00 2001 From: Martin Holoubek Date: Fri, 5 Dec 2025 11:09:18 +0100 Subject: [PATCH 1/3] Rebased the patched. Updated the [meta.yaml] --- recipe/meta.yaml | 7 +- .../patches/0001-windows-ssl-lib-names.patch | 6 +- recipe/patches/0002-fix-win-setup-cmds.patch | 8 +- .../0003-Link-against-grpc-and-abseil.patch | 10 +- .../0004-force-protoc-executable.patch | 6 +- ...inkages-of-grpc-_unsecure-as-private.patch | 27 ++- ...-set-_DLL_EXPORTS-when-building-and-.patch | 10 +- ...ing-linkages-for-gRPC_BUILD_TESTS-ON.patch | 22 +- ...-add-enable_testing-so-tests-get-run.patch | 2 +- ...nd-utf8_range-use-protobuf-s-version.patch | 75 +------ ...ildtests_cxx-target-to-end2end-tests.patch | 188 ++++++++---------- ...-linkage-to-openssl-to-grpc_unsecure.patch | 6 +- 12 files changed, 142 insertions(+), 225 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d7db11a..8c67fda0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.74.1" %} +{% set version = "1.76.0" %} # 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: 7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228 + sha256: 0af37b800953130b47c075b56683ee60bdc3eda3c37fc6004193f5b569758204 patches: - patches/0001-windows-ssl-lib-names.patch - patches/0002-fix-win-setup-cmds.patch @@ -73,7 +73,7 @@ source: {% endif %} build: - number: 1 + number: 0 outputs: - name: libgrpc @@ -193,6 +193,7 @@ outputs: run: - python - {{ pin_subpackage('libgrpc', exact=True) }} + - typing-extensions >=4.12,<5 test: source_files: - examples/python/helloworld/ diff --git a/recipe/patches/0001-windows-ssl-lib-names.patch b/recipe/patches/0001-windows-ssl-lib-names.patch index 3b9bd887..cece4469 100644 --- a/recipe/patches/0001-windows-ssl-lib-names.patch +++ b/recipe/patches/0001-windows-ssl-lib-names.patch @@ -1,4 +1,4 @@ -From d5ed2615f402d4b60de392d7faa49ce7e8fa6513 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Mon, 17 Feb 2020 15:45:06 -0600 Subject: [PATCH 01/14] windows ssl lib names @@ -11,10 +11,10 @@ Co-Authored-By: Marius van Niekerk 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 39ca17e824..3a879f037b 100644 +index XXXXXXX..XXXXXXX 100644 --- a/setup.py +++ b/setup.py -@@ -367,10 +367,10 @@ if "win32" in sys.platform: +@@ -377,10 +377,10 @@ if "win32" in sys.platform: "ws2_32", ) if BUILD_WITH_SYSTEM_OPENSSL: diff --git a/recipe/patches/0002-fix-win-setup-cmds.patch b/recipe/patches/0002-fix-win-setup-cmds.patch index e41c404d..71eee255 100644 --- a/recipe/patches/0002-fix-win-setup-cmds.patch +++ b/recipe/patches/0002-fix-win-setup-cmds.patch @@ -1,4 +1,4 @@ -From f50311e7ac7f652ac5692f88d92dc0fb9fa6e3c1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Tue, 18 Feb 2020 13:53:05 -0600 Subject: [PATCH 02/14] fix win setup cmds @@ -12,10 +12,10 @@ Co-Authored-By: H. Vetinari 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 3a879f037b..adfec063fd 100644 +index XXXXXXX..XXXXXXX 100644 --- a/setup.py +++ b/setup.py -@@ -209,6 +209,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value( +@@ -211,6 +211,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value( def check_linker_need_libatomic(): @@ -25,7 +25,7 @@ index 3a879f037b..adfec063fd 100644 """Test if linker on system needs libatomic.""" code_test = ( b"#include \n" -@@ -266,9 +269,6 @@ if EXTRA_ENV_COMPILE_ARGS is None: +@@ -274,9 +277,6 @@ if EXTRA_ENV_COMPILE_ARGS is None: # MSVC by defaults uses C++14 and C89 so both needs to be configured. EXTRA_ENV_COMPILE_ARGS += " /std:c++17" EXTRA_ENV_COMPILE_ARGS += " /std:c11" diff --git a/recipe/patches/0003-Link-against-grpc-and-abseil.patch b/recipe/patches/0003-Link-against-grpc-and-abseil.patch index 4ca37dc3..d89c9d11 100644 --- a/recipe/patches/0003-Link-against-grpc-and-abseil.patch +++ b/recipe/patches/0003-Link-against-grpc-and-abseil.patch @@ -1,4 +1,4 @@ -From 41f565b1cc5a805928c9d7a6542f1e6802a4bfa4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Mon, 13 Jun 2022 17:13:07 -0400 Subject: [PATCH 03/14] Link against grpc and abseil @@ -9,10 +9,10 @@ Co-Authored-By: H. Vetinari 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index adfec063fd..266a690474 100644 +index XXXXXXX..XXXXXXX 100644 --- a/setup.py +++ b/setup.py -@@ -180,6 +180,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value( +@@ -182,6 +182,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value( "GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False" ) @@ -21,7 +21,7 @@ index adfec063fd..266a690474 100644 # For local development use only: This skips building gRPC Core and its # dependencies, including protobuf and boringssl. This allows "incremental" # compilation by first building gRPC Core using make, then building only the -@@ -378,10 +380,20 @@ if BUILD_WITH_SYSTEM_CARES: +@@ -388,10 +390,20 @@ if BUILD_WITH_SYSTEM_CARES: if BUILD_WITH_SYSTEM_RE2: EXTENSION_LIBRARIES += ("re2",) if BUILD_WITH_SYSTEM_ABSL: @@ -46,7 +46,7 @@ index adfec063fd..266a690474 100644 DEFINE_MACROS = (("_WIN32_WINNT", 0x600),) asm_files = [] -@@ -493,6 +505,9 @@ def cython_extensions_and_necessity(): +@@ -503,6 +515,9 @@ def cython_extensions_and_necessity(): prefix + "libgrpc.a", ] core_c_files = [] diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch index 223ec197..401f0cca 100644 --- a/recipe/patches/0004-force-protoc-executable.patch +++ b/recipe/patches/0004-force-protoc-executable.patch @@ -1,4 +1,4 @@ -From 29ede911ee9d4f9096f5719d20103e180271e1cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Sep 2020 14:20:04 +0200 Subject: [PATCH 04/14] force protoc executable @@ -8,10 +8,10 @@ Subject: [PATCH 04/14] force protoc executable 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake -index ad80ca6e46..7bae8d95bd 100644 +index XXXXXXX..XXXXXXX 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake -@@ -70,21 +70,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") +@@ -71,21 +71,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") endif() # Well-known proto files are expected to be in the Protobuf include directory. get_target_property(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR ${_gRPC_PROTOBUF_LIBRARIES} INTERFACE_INCLUDE_DIRECTORIES) 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 cb185dce..39c307ab 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 @@ -16,7 +16,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index f652a4055c..2fae60378f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3069,35 +3069,40 @@ target_include_directories(grpc +@@ -3126,37 +3126,42 @@ target_include_directories(grpc + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc @@ -26,12 +28,12 @@ index f652a4055c..2fae60378f 100644 - ${_gRPC_RE2_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - absl::algorithm_container -- absl::config - absl::no_destructor - absl::btree - absl::flat_hash_map - absl::flat_hash_set - absl::inlined_vector +- absl::node_hash_map - absl::bind_front - absl::function_ref - absl::hash @@ -59,12 +61,12 @@ index f652a4055c..2fae60378f 100644 + # external dependencies that need to available at runtime + PUBLIC ${_gRPC_SSL_LIBRARIES} + PRIVATE absl::algorithm_container -+ PRIVATE absl::config + PRIVATE absl::no_destructor + PRIVATE absl::btree + PRIVATE absl::flat_hash_map + PRIVATE absl::flat_hash_set + PRIVATE absl::inlined_vector ++ PRIVATE absl::node_hash_map + PRIVATE absl::bind_front + PRIVATE absl::function_ref + PRIVATE absl::hash @@ -84,24 +86,22 @@ index f652a4055c..2fae60378f 100644 endif() foreach(_hdr -@@ -3791,32 +3796,37 @@ target_include_directories(grpc_unsecure +@@ -3859,34 +3864,39 @@ target_include_directories(grpc_unsecure + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_unsecure - ${_gRPC_ALLTARGETS_LIBRARIES} -+ # core libs -+ PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} -+ # vendored libs -+ PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} - upb_textformat_lib +- upb_textformat_lib - ${_gRPC_ZLIB_LIBRARIES} - absl::algorithm_container -- absl::config - absl::no_destructor - absl::btree - absl::flat_hash_map - absl::flat_hash_set - absl::inlined_vector +- absl::node_hash_map - absl::bind_front - absl::function_ref - absl::hash @@ -115,17 +115,22 @@ index f652a4055c..2fae60378f 100644 - ${_gRPC_CARES_LIBRARIES} - gpr - ${_gRPC_ADDRESS_SORTING_LIBRARIES} ++ # core libs ++ PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} ++ # vendored libs ++ PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} ++ PRIVATE upb_textformat_lib + # external dependencies used within grpc + PRIVATE ${_gRPC_ZLIB_LIBRARIES} + PRIVATE ${_gRPC_CARES_LIBRARIES} + # external dependencies that need to available at runtime + PRIVATE absl::algorithm_container -+ PRIVATE absl::config + PRIVATE absl::no_destructor + PRIVATE absl::btree + PRIVATE absl::flat_hash_map + PRIVATE absl::flat_hash_set + PRIVATE absl::inlined_vector ++ PRIVATE absl::node_hash_map + PRIVATE absl::bind_front + PRIVATE absl::function_ref + PRIVATE absl::hash 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 52f60805..867512a3 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 @@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fae60378f..66be39ef73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2063,10 +2063,8 @@ if(WIN32 AND MSVC) +@@ -2095,10 +2095,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -25,7 +25,7 @@ index 2fae60378f..66be39ef73 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb -@@ -3042,11 +3040,8 @@ if(WIN32 AND MSVC) +@@ -3099,11 +3097,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -39,7 +39,7 @@ index 2fae60378f..66be39ef73 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb -@@ -3769,11 +3764,8 @@ if(WIN32 AND MSVC) +@@ -3832,11 +3827,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -53,7 +53,7 @@ index 2fae60378f..66be39ef73 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb -@@ -4791,12 +4783,8 @@ if(WIN32 AND MSVC) +@@ -4849,12 +4841,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -68,7 +68,7 @@ index 2fae60378f..66be39ef73 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb -@@ -5531,12 +5519,8 @@ if(WIN32 AND MSVC) +@@ -5593,12 +5581,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 27c5e629..a2e78296 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 @@ -17,7 +17,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 66be39ef73..b0f134790e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3229,6 +3229,7 @@ target_link_libraries(grpc_test_util +@@ -3285,6 +3285,7 @@ target_link_libraries(grpc_test_util ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -25,7 +25,7 @@ index 66be39ef73..b0f134790e 100644 absl::symbolize absl::log_initialize grpc -@@ -3304,6 +3305,7 @@ target_link_libraries(grpc_test_util_unsecure +@@ -3359,6 +3360,7 @@ target_link_libraries(grpc_test_util_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -33,7 +33,7 @@ index 66be39ef73..b0f134790e 100644 absl::symbolize absl::log_initialize grpc_unsecure -@@ -8335,6 +8337,7 @@ target_include_directories(authorization_matchers_test +@@ -8556,6 +8558,7 @@ target_include_directories(authorization_matchers_test ) target_link_libraries(authorization_matchers_test @@ -41,7 +41,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -17316,6 +17319,7 @@ target_include_directories(grpc_authorization_engine_test +@@ -18564,6 +18567,7 @@ target_include_directories(grpc_authorization_engine_test ) target_link_libraries(grpc_authorization_engine_test @@ -49,7 +49,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -19776,6 +19780,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -20800,6 +20804,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(httpcli_test @@ -57,7 +57,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc++_test_util -@@ -21869,6 +21874,7 @@ target_include_directories(matchers_test +@@ -23529,6 +23534,7 @@ target_include_directories(matchers_test ) target_link_libraries(matchers_test @@ -65,7 +65,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -26804,6 +26810,7 @@ target_include_directories(resolve_address_using_ares_resolver_test +@@ -28959,6 +28965,7 @@ target_include_directories(resolve_address_using_ares_resolver_test ) target_link_libraries(resolve_address_using_ares_resolver_test @@ -73,7 +73,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -26892,6 +26899,7 @@ target_include_directories(resolve_address_using_native_resolver_test +@@ -29047,6 +29054,7 @@ target_include_directories(resolve_address_using_native_resolver_test ) target_link_libraries(resolve_address_using_native_resolver_test @@ -81,7 +81,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -35879,6 +35887,7 @@ target_include_directories(xds_common_types_test +@@ -39547,6 +39555,7 @@ target_include_directories(xds_common_types_test ) target_link_libraries(xds_common_types_test @@ -89,7 +89,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc++ -@@ -36530,6 +36539,7 @@ target_include_directories(xds_credentials_test +@@ -40198,6 +40207,7 @@ target_include_directories(xds_credentials_test ) target_link_libraries(xds_credentials_test @@ -97,7 +97,7 @@ index 66be39ef73..b0f134790e 100644 ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util -@@ -41495,6 +41505,7 @@ target_include_directories(xds_listener_resource_type_test +@@ -45163,6 +45173,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 ee50c5cf..da0d47ab 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 @@ -11,7 +11,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index b0f134790e..e87b7b557d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) +@@ -50,6 +50,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) option(gRPC_BUILD_CODEGEN "Build codegen" ON) option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON) 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 c69a406b..fb378d46 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,10 +9,10 @@ Subject: [PATCH 09/14] 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 e87b7b557d..c0d1f6f363 100644 +index ed6a33c..462bec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -352,11 +352,15 @@ else() +@@ -354,11 +354,15 @@ else() set(_gRPC_CORE_NOSTDCXX_FLAGS "") endif() @@ -29,7 +29,7 @@ index e87b7b557d..c0d1f6f363 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) find_library(LIBRT rt) if(LIBRT) -@@ -3072,8 +3076,6 @@ target_link_libraries(grpc +@@ -3130,8 +3134,6 @@ target_link_libraries(grpc PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} # vendored libs PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} @@ -38,15 +38,15 @@ index e87b7b557d..c0d1f6f363 100644 # external dependencies used within grpc PRIVATE ${_gRPC_CARES_LIBRARIES} PRIVATE ${_gRPC_RE2_LIBRARIES} -@@ -3798,7 +3800,6 @@ target_link_libraries(grpc_unsecure +@@ -3867,7 +3869,6 @@ target_link_libraries(grpc_unsecure PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES} # vendored libs PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES} -- upb_textformat_lib +- PRIVATE upb_textformat_lib # external dependencies used within grpc PRIVATE ${_gRPC_ZLIB_LIBRARIES} PRIVATE ${_gRPC_CARES_LIBRARIES} -@@ -3964,672 +3965,6 @@ target_link_libraries(gtest +@@ -4033,672 +4034,6 @@ target_link_libraries(gtest endif() @@ -719,69 +719,8 @@ index e87b7b557d..c0d1f6f363 100644 if(gRPC_BUILD_TESTS) -@@ -6118,7 +5453,6 @@ target_include_directories(grpc_authorization_provider - ) - target_link_libraries(grpc_authorization_provider - ${_gRPC_ALLTARGETS_LIBRARIES} -- upb_textformat_lib - ${_gRPC_RE2_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - absl::config -@@ -47339,8 +46673,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_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" -- "-lgrpc" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" -+ "-lgrpc -lupb" -+ "-laddress_sorting" - "grpc.pc") - - # grpc_unsecure .pc file -@@ -47350,8 +46684,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_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" -- "-lgrpc_unsecure" -- "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" -+ "-lgrpc_unsecure -lupb" -+ "-laddress_sorting" - "grpc_unsecure.pc") - - # grpc++ .pc file -@@ -47361,8 +46695,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_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_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc" - "libcares openssl re2 zlib" -- "-lgrpc++" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" -+ "-lgrpc++ -lupb" -+ "-laddress_sorting" - "grpc++.pc") - - # grpc++_unsecure .pc file -@@ -47372,8 +46706,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_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_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc_unsecure" - "libcares zlib" -- "-lgrpc++_unsecure" -- "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" -+ "-lgrpc++_unsecure -lupb" -+ "-laddress_sorting" - "grpc++_unsecure.pc") - - # grpcpp_otel_plugin .pc file -@@ -47383,6 +46717,6 @@ 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_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_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api" - "libcares openssl re2 zlib" -- "-lgrpcpp_otel_plugin" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" -+ "-lgrpcpp_otel_plugin -lupb" -+ "-laddress_sorting" - "grpcpp_otel_plugin.pc") diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 9156e5f48f..e6fa81932d 100644 +index 9156e5f..e6fa819 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -12,9 +12,7 @@ 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 1c3eaa3e..3f28797f 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 @@ -9,79 +9,17 @@ easily greppable (to make a choice of subset, and an easy rule for rebasing), as well as being the most high-level tests that assure the library functions as intended. -Plus four support libraries (`grpc{,++}_test{,_config,_util}`) and the vendored gtest +Plus four support libraries (\`grpc{,++}_test{,_config,_util}\`) and the vendored gtest -When rebasing, use `git show | grep -e "^-.*end2end_"` to ensure that conflict +When rebasing, use \`git show | grep -e "^-.*end2end_"\` to ensure that conflict resolution didn't accidentally remove an (non-xds) end2end test; for any new end2end tests, ensure to rename the guard from gRPC_BUILD_TESTS to gRPC_CF_TESTS Due to running into the 6h timeout, we remove the xds_* tests, most of which take 10+ minutes -to compile, compare with the timings below. - -``` -2025-08-08T08:44:51.7026562Z [3596/8027] Building CXX object CMakeFiles/test_cpp_end2end_tls_credentials_test.dir/test/cpp/end2end/tls_credentials_test.cc.o -2025-08-08T08:44:52.4521352Z [3597/8027] Building CXX object CMakeFiles/xds_cluster_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T08:54:05.5536236Z [3844/8027] Building CXX object CMakeFiles/xds_cluster_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T08:54:13.1026993Z [3845/8027] Building CXX object CMakeFiles/xds_cluster_type_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T09:03:08.5626467Z [4093/8027] Building CXX object CMakeFiles/xds_cluster_type_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T09:03:13.7959640Z [4094/8027] Building CXX object CMakeFiles/xds_core_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T09:12:13.4537287Z [4339/8027] Building CXX object CMakeFiles/xds_core_end2end_test.dir/test/cpp/util/tls_test_utils.cc.o -2025-08-08T09:12:16.5984319Z [4340/8027] Building CXX object CMakeFiles/xds_credentials_end2end_test.dir/gens/src/proto/grpc/testing/echo.pb.cc.o ----------------------------- -2025-08-08T09:13:02.1385556Z [4358/8027] Building CXX object CMakeFiles/xds_credentials_end2end_test.dir/test/cpp/end2end/xds/xds_credentials_end2end_test.cc.o -2025-08-08T09:13:03.1831969Z [4359/8027] Building CXX object CMakeFiles/xds_csds_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T09:24:00.9950004Z [4651/8027] Building CXX object CMakeFiles/xds_csds_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T09:24:01.2910360Z [4652/8027] Building CXX object CMakeFiles/xds_enabled_server_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T09:33:01.4250126Z [4897/8027] Building CXX object CMakeFiles/xds_enabled_server_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T09:33:05.3160061Z [4898/8027] Building CXX object CMakeFiles/xds_fallback_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T09:41:58.4796900Z [5143/8027] Building CXX object CMakeFiles/xds_fallback_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T09:41:59.2388396Z [5144/8027] Building CXX object CMakeFiles/xds_fault_injection_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T09:51:03.2442859Z [5393/8027] Building CXX object CMakeFiles/xds_fault_injection_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T09:51:04.5423270Z [5394/8027] Building CXX object CMakeFiles/xds_gcp_authn_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T10:00:05.2411591Z [5641/8027] Building CXX object CMakeFiles/xds_gcp_authn_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:00:06.5342156Z [5642/8027] Building CXX object CMakeFiles/xds_http_connect_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T10:09:11.3460336Z [5890/8027] Building CXX object CMakeFiles/xds_http_connect_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:09:11.9078535Z [5891/8027] Building CXX object CMakeFiles/xds_outlier_detection_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T10:18:19.6581935Z [6140/8027] Building CXX object CMakeFiles/xds_outlier_detection_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:18:20.9690035Z [6141/8027] Building CXX object CMakeFiles/xds_override_host_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T10:27:31.8386017Z [6391/8027] Building CXX object CMakeFiles/xds_override_host_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:27:35.0628420Z [6392/8027] Building CXX object CMakeFiles/xds_pick_first_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T10:36:37.4679378Z [6642/8027] Building CXX object CMakeFiles/xds_pick_first_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:36:40.6525610Z [6643/8027] Building CXX object CMakeFiles/xds_ring_hash_end2end_test.dir/gens/src/proto/grpc/testing/echo.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T10:45:40.6789520Z [6890/8027] Building CXX object CMakeFiles/xds_ring_hash_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:45:41.1625523Z [6891/8027] Building CXX object CMakeFiles/xds_rls_end2end_test.dir/gens/src/proto/grpc/lookup/v1/rls.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v -2025-08-08T10:54:46.9382069Z [7141/8027] Building CXX object CMakeFiles/xds_rls_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T10:54:47.9069979Z [7142/8027] Building CXX object CMakeFiles/xds_routing_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v -2025-08-08T11:04:02.6418027Z [7392/8027] Building CXX object CMakeFiles/xds_routing_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T11:04:02.8659404Z [7393/8027] Building CXX object CMakeFiles/xds_security_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v^v^v^ -2025-08-08T11:13:35.5518487Z [7651/8027] Building CXX object CMakeFiles/xds_security_end2end_test.dir/test/cpp/end2end/xds/xds_utils.cc.o -2025-08-08T11:13:37.4659668Z [7652/8027] Building CXX object CMakeFiles/xds_wrr_end2end_test.dir/gens/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc.o - [...] ^v^v^v^v^v^v^v^v^v^v -2025-08-08T11:22:34.6491490Z [7900/8027] Building CXX object CMakeFiles/xds_wrr_end2end_test.dir/test/cpp/util/tls_test_utils.cc.o -2025-08-08T11:22:34.6749979Z [7901/8027] Creating library symlink third_party/benchmark/src/libbenchmark_main.so.1 third_party/benchmark/src/libbenchmark_main.so -``` +to compile. --- - CMakeLists.txt | 717 +++---------------------------------------------- - 1 file changed, 41 insertions(+), 676 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index c0d1f6f363..b44b6fe124 100644 +index 462bec4..c0fa39f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,12 @@ set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory for @@ -98,7 +36,7 @@ index c0d1f6f363..b44b6fe124 100644 enable_testing() endif() -@@ -739,7 +740,7 @@ protobuf_generate_grpc_cpp_with_import_path_correction( +@@ -750,7 +751,7 @@ protobuf_generate_grpc_cpp_with_import_path_correction( # This enables CMake to build the project without requiring submodules # in the third_party directory as long as test builds are disabled. @@ -107,8 +45,11 @@ index c0d1f6f363..b44b6fe124 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/testing/benchmark_service.proto src/proto/grpc/testing/benchmark_service.proto ) -@@ -1278,167 +1279,16 @@ endif() +@@ -1287,171 +1288,19 @@ protobuf_generate_grpc_cpp_with_import_path_correction( + ) + endif() ++ if(gRPC_BUILD_TESTS) add_custom_target(buildtests_c) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -212,6 +153,7 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx channelz_registry_test) - add_dependencies(buildtests_cxx channelz_service_test) - add_dependencies(buildtests_cxx channelz_test) +- add_dependencies(buildtests_cxx channelz_tool_test) - add_dependencies(buildtests_cxx channelz_v2_service_test) - add_dependencies(buildtests_cxx check_gcp_environment_linux_test) - add_dependencies(buildtests_cxx check_gcp_environment_windows_test) @@ -233,6 +175,7 @@ index c0d1f6f363..b44b6fe124 100644 - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx client_ssl_test) - endif() +- add_dependencies(buildtests_cxx client_test) - add_dependencies(buildtests_cxx cmdline_test) - add_dependencies(buildtests_cxx codegen_test_full) - add_dependencies(buildtests_cxx codegen_test_minimal) @@ -275,7 +218,7 @@ index c0d1f6f363..b44b6fe124 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx end2end_chaotic_good_no_logging_test) endif() -@@ -1454,508 +1304,23 @@ if(gRPC_BUILD_TESTS) +@@ -1469,526 +1318,24 @@ 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) @@ -314,6 +257,7 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx filter_fusion_test) - add_dependencies(buildtests_cxx filter_test_test) - add_dependencies(buildtests_cxx flaky_network_test) +- add_dependencies(buildtests_cxx flow_control_manager_test) - add_dependencies(buildtests_cxx flow_control_test) - add_dependencies(buildtests_cxx for_each_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -395,6 +339,7 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx initial_settings_frame_bad_client_test) - add_dependencies(buildtests_cxx insecure_credentials_test) - add_dependencies(buildtests_cxx insecure_security_connector_test) +- add_dependencies(buildtests_cxx instrument_test) - add_dependencies(buildtests_cxx inter_activity_latch_test) - add_dependencies(buildtests_cxx inter_activity_mutex_test) - add_dependencies(buildtests_cxx inter_activity_pipe_test) @@ -415,6 +360,8 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx jwt_verifier_test) - add_dependencies(buildtests_cxx lame_client_test) - add_dependencies(buildtests_cxx latch_test) +- add_dependencies(buildtests_cxx latent_see_service_test) +- add_dependencies(buildtests_cxx latent_see_test) - add_dependencies(buildtests_cxx layout_test) - add_dependencies(buildtests_cxx lb_get_cpu_stats_test) - add_dependencies(buildtests_cxx lb_load_data_store_test) @@ -544,6 +491,7 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx resolve_address_using_native_resolver_test) add_dependencies(buildtests_cxx resource_quota_end2end_stress_test) - add_dependencies(buildtests_cxx resource_quota_test) +- add_dependencies(buildtests_cxx resource_tracker_test) - add_dependencies(buildtests_cxx retry_service_config_test) - add_dependencies(buildtests_cxx retry_throttle_test) - add_dependencies(buildtests_cxx ring_buffer_test) @@ -593,6 +541,10 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx socket_utils_test) - endif() - add_dependencies(buildtests_cxx sorted_pack_test) + add_dependencies(buildtests_cxx spiffe_bundle_map_end2end_test) +- if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +- add_dependencies(buildtests_cxx spiffe_ssl_transport_security_test) +- endif() - add_dependencies(buildtests_cxx spiffe_utils_test) - add_dependencies(buildtests_cxx spinlock_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -610,6 +562,7 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx status_flag_test) - add_dependencies(buildtests_cxx status_helper_test) - add_dependencies(buildtests_cxx status_util_test) +- add_dependencies(buildtests_cxx stream_data_queue_test) - add_dependencies(buildtests_cxx stream_leak_with_queued_flow_control_update_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx streaming_throughput_test) @@ -672,12 +625,14 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx tls_key_export_test) - add_dependencies(buildtests_cxx tls_security_connector_test) - add_dependencies(buildtests_cxx too_many_pings_test) +- add_dependencies(buildtests_cxx tool_test_test) - add_dependencies(buildtests_cxx trace_flags_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx traced_buffer_list_test) - endif() - add_dependencies(buildtests_cxx transport_security_common_api_test) - add_dependencies(buildtests_cxx transport_security_test) +- add_dependencies(buildtests_cxx trie_lookup_test) - add_dependencies(buildtests_cxx try_join_test) - add_dependencies(buildtests_cxx try_seq_metadata_test) - add_dependencies(buildtests_cxx try_seq_test) @@ -706,6 +661,7 @@ index c0d1f6f363..b44b6fe124 100644 - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx work_serializer_test) - endif() +- add_dependencies(buildtests_cxx writable_streams_test) - add_dependencies(buildtests_cxx write_size_policy_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx writes_per_rpc_test) @@ -749,6 +705,8 @@ index c0d1f6f363..b44b6fe124 100644 - add_dependencies(buildtests_cxx xds_http_filters_test) - add_dependencies(buildtests_cxx xds_lb_policy_registry_test) - add_dependencies(buildtests_cxx xds_listener_resource_type_test) +- add_dependencies(buildtests_cxx xds_matcher_parse_test) +- add_dependencies(buildtests_cxx xds_matcher_test) - add_dependencies(buildtests_cxx xds_metadata_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx xds_outlier_detection_end2end_test) @@ -774,6 +732,9 @@ index c0d1f6f363..b44b6fe124 100644 - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx xds_security_end2end_test) - endif() +- if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +- add_dependencies(buildtests_cxx xds_security_spiffe_end2end_test) +- endif() - add_dependencies(buildtests_cxx xds_stats_watcher_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_cxx xds_wrr_end2end_test) @@ -784,7 +745,15 @@ index c0d1f6f363..b44b6fe124 100644 add_custom_target(buildtests DEPENDS buildtests_c buildtests_cxx) -@@ -3169,7 +2534,7 @@ if(gRPC_INSTALL) +@@ -1996,6 +1343,7 @@ endif() + + + ++ + add_library(address_sorting + third_party/address_sorting/address_sorting.c + third_party/address_sorting/address_sorting_posix.c +@@ -3227,7 +2575,7 @@ if(gRPC_INSTALL) ) endif() @@ -793,7 +762,7 @@ index c0d1f6f363..b44b6fe124 100644 add_library(grpc_test_util test/core/event_engine/test_init.cc -@@ -3891,7 +3256,7 @@ if(gRPC_INSTALL) +@@ -3960,7 +3308,7 @@ if(gRPC_INSTALL) ) endif() @@ -802,7 +771,7 @@ index c0d1f6f363..b44b6fe124 100644 add_library(gtest third_party/googletest/googlemock/src/gmock-cardinalities.cc -@@ -4613,7 +3978,7 @@ if(gRPC_INSTALL) +@@ -4686,7 +4034,7 @@ if(gRPC_INSTALL) endif() endif() @@ -811,7 +780,7 @@ index c0d1f6f363..b44b6fe124 100644 add_library(grpc++_test src/cpp/client/channel_test_peer.cc -@@ -4686,7 +4051,7 @@ foreach(_hdr +@@ -4759,7 +4107,7 @@ foreach(_hdr endforeach() endif() @@ -820,7 +789,7 @@ index c0d1f6f363..b44b6fe124 100644 add_library(grpc++_test_config test/cpp/util/test_config_cc.cc -@@ -4738,7 +4103,7 @@ target_link_libraries(grpc++_test_config +@@ -4811,7 +4159,7 @@ target_link_libraries(grpc++_test_config endif() @@ -829,7 +798,7 @@ index c0d1f6f363..b44b6fe124 100644 add_library(grpc++_test_util src/core/util/subprocess_posix.cc -@@ -6056,7 +5421,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -6223,7 +5571,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -838,7 +807,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(admin_services_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/csds.pb.cc -@@ -7472,7 +6837,7 @@ target_link_libraries(arena_test +@@ -7688,7 +7036,7 @@ target_link_libraries(arena_test endif() @@ -847,7 +816,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(async_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc -@@ -10727,7 +10092,7 @@ target_link_libraries(client_authority_filter_test +@@ -11252,7 +10600,7 @@ target_link_libraries(client_authority_filter_test endif() @@ -856,7 +825,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(client_callback_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -10972,7 +10337,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -11497,7 +10845,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -865,7 +834,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(client_interceptors_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -11049,7 +10414,7 @@ target_link_libraries(client_interceptors_end2end_test +@@ -11574,7 +10922,7 @@ target_link_libraries(client_interceptors_end2end_test endif() @@ -874,7 +843,7 @@ index c0d1f6f363..b44b6fe124 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(client_lb_end2end_test -@@ -11743,7 +11108,7 @@ target_link_libraries(connectivity_state_test +@@ -12315,7 +11663,7 @@ target_link_libraries(connectivity_state_test endif() @@ -883,7 +852,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(context_allocator_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -12599,7 +11964,7 @@ target_link_libraries(duplicate_header_bad_client_test +@@ -13239,7 +12587,7 @@ target_link_libraries(duplicate_header_bad_client_test endif() @@ -892,7 +861,7 @@ index c0d1f6f363..b44b6fe124 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(end2end_chaotic_good_no_logging_test -@@ -12703,7 +12068,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -13344,7 +12692,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -901,7 +870,7 @@ index c0d1f6f363..b44b6fe124 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(end2end_chaotic_good_test -@@ -12895,7 +12260,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -13537,7 +12885,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -910,7 +879,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_http2_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -12997,7 +12362,7 @@ target_link_libraries(end2end_http2_no_logging_test +@@ -13640,7 +12988,7 @@ target_link_libraries(end2end_http2_no_logging_test endif() @@ -919,7 +888,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_http2_security_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13099,7 +12464,7 @@ target_link_libraries(end2end_http2_security_no_logging_test +@@ -13743,7 +13091,7 @@ target_link_libraries(end2end_http2_security_no_logging_test endif() @@ -928,7 +897,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_http2_security_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13289,7 +12654,7 @@ target_link_libraries(end2end_http2_security_test +@@ -13934,7 +13282,7 @@ target_link_libraries(end2end_http2_security_test endif() @@ -937,7 +906,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_http2_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13479,7 +12844,7 @@ target_link_libraries(end2end_http2_test +@@ -14125,7 +13473,7 @@ target_link_libraries(end2end_http2_test endif() @@ -946,7 +915,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_inproc_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13581,7 +12946,7 @@ target_link_libraries(end2end_inproc_no_logging_test +@@ -14228,7 +13576,7 @@ target_link_libraries(end2end_inproc_no_logging_test endif() @@ -955,7 +924,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_inproc_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13771,7 +13136,7 @@ target_link_libraries(end2end_inproc_test +@@ -14713,7 +14061,7 @@ target_link_libraries(end2end_ph2_test endif() @@ -964,7 +933,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_posix_no_logging_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -13873,7 +13238,7 @@ target_link_libraries(end2end_posix_no_logging_test +@@ -14816,7 +14164,7 @@ target_link_libraries(end2end_posix_no_logging_test endif() @@ -973,7 +942,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_posix_test ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc -@@ -14063,7 +13428,7 @@ target_link_libraries(end2end_posix_test +@@ -15007,7 +14355,7 @@ target_link_libraries(end2end_posix_test endif() @@ -982,7 +951,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -16201,7 +15566,7 @@ target_link_libraries(gcp_authentication_filter_test +@@ -17444,7 +16792,7 @@ target_link_libraries(gcp_authentication_filter_test endif() @@ -991,7 +960,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(generic_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -16708,7 +16073,7 @@ target_link_libraries(grpc_authorization_policy_provider_test +@@ -17951,7 +17299,7 @@ target_link_libraries(grpc_authorization_policy_provider_test endif() @@ -1000,7 +969,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(grpc_authz_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -17722,7 +17087,7 @@ target_link_libraries(grpclb_api_test +@@ -18965,7 +18313,7 @@ target_link_libraries(grpclb_api_test endif() @@ -1009,7 +978,7 @@ index c0d1f6f363..b44b6fe124 100644 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(grpclb_end2end_test -@@ -18493,7 +17858,7 @@ target_link_libraries(headers_bad_client_test +@@ -19452,7 +18800,7 @@ target_link_libraries(headers_bad_client_test endif() @@ -1018,7 +987,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(health_service_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc -@@ -19174,7 +18539,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -20194,7 +19542,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1027,7 +996,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(hybrid_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -21306,7 +20671,7 @@ target_link_libraries(memory_quota_test +@@ -22961,7 +22309,7 @@ target_link_libraries(memory_quota_test endif() @@ -1035,8 +1004,8 @@ index c0d1f6f363..b44b6fe124 100644 +if(gRPC_CF_TESTS) add_executable(memory_usage_test - src/core/util/time.cc -@@ -22314,7 +21679,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + src/core/lib/debug/trace.cc +@@ -23977,7 +23325,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1045,7 +1014,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(orca_service_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_service.pb.cc -@@ -23717,7 +23082,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +@@ -25463,7 +24811,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() @@ -1054,7 +1023,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(port_sharing_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -25644,7 +25009,7 @@ target_link_libraries(random_early_detection_test +@@ -27785,7 +27133,7 @@ target_link_libraries(random_early_detection_test endif() @@ -1063,7 +1032,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(raw_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -26246,7 +25611,7 @@ target_link_libraries(resolve_address_using_native_resolver_test +@@ -28396,7 +27744,7 @@ target_link_libraries(resolve_address_using_native_resolver_test endif() @@ -1072,7 +1041,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(resource_quota_end2end_stress_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -26528,7 +25893,7 @@ target_link_libraries(ring_hash_test +@@ -28717,7 +28065,7 @@ target_link_libraries(ring_hash_test endif() @@ -1081,7 +1050,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(rls_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lookup/v1/rls.pb.cc -@@ -27467,7 +26832,7 @@ target_link_libraries(server_early_return_test +@@ -29705,7 +29053,7 @@ target_link_libraries(server_early_return_test endif() @@ -1090,7 +1059,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(server_interceptors_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -27753,7 +27118,7 @@ target_link_libraries(server_test +@@ -29991,7 +29339,7 @@ target_link_libraries(server_test endif() @@ -1099,7 +1068,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(service_config_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc -@@ -29609,7 +28974,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test +@@ -32296,7 +31644,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test endif() @@ -1108,7 +1077,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(test_core_credentials_transport_tls_tls_credentials_test test/core/credentials/transport/tls/tls_credentials_test.cc -@@ -29971,7 +29336,7 @@ target_link_libraries(test_cpp_client_credentials_test +@@ -32787,7 +32135,7 @@ target_link_libraries(test_cpp_client_credentials_test endif() @@ -1117,7 +1086,7 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(test_cpp_end2end_ssl_credentials_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc -@@ -30047,7 +29412,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test +@@ -32863,7 +32211,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test endif() @@ -1126,3 +1095,6 @@ index c0d1f6f363..b44b6fe124 100644 add_executable(test_cpp_end2end_tls_credentials_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc + +-- +2.39.5 diff --git a/recipe/patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch b/recipe/patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch index f7562ebe..c8e2f8d7 100644 --- a/recipe/patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch +++ b/recipe/patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch @@ -15,7 +15,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index b44b6fe124..b28c5a7318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3091,6 +3091,7 @@ add_library(grpc_unsecure +@@ -3792,6 +3792,7 @@ add_library(grpc_unsecure src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/fake_transport_security.cc src/core/tsi/local_transport_security.cc @@ -23,11 +23,11 @@ index b44b6fe124..b28c5a7318 100644 src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc src/core/util/backoff.cc -@@ -3169,6 +3170,7 @@ target_link_libraries(grpc_unsecure +@@ -3872,6 +3873,7 @@ target_link_libraries(grpc_unsecure PRIVATE ${_gRPC_ZLIB_LIBRARIES} PRIVATE ${_gRPC_CARES_LIBRARIES} # external dependencies that need to available at runtime + PUBLIC ${_gRPC_SSL_LIBRARIES} PRIVATE absl::algorithm_container - PRIVATE absl::config PRIVATE absl::no_destructor + PRIVATE absl::btree From 269bf07544ad6d9de26e89c684da02029e1e33db Mon Sep 17 00:00:00 2001 From: Martin Holoubek Date: Fri, 5 Dec 2025 11:11:51 +0100 Subject: [PATCH 2/3] Re-rendered using conda-smithy --- .ci_support/linux_64_.yaml | 8 +------- .ci_support/linux_aarch64_.yaml | 8 +------- .ci_support/linux_ppc64le_.yaml | 8 +------- .ci_support/osx_64_.yaml | 8 +------- .ci_support/osx_arm64_.yaml | 8 +------- .ci_support/win_64_.yaml | 9 +-------- 6 files changed, 6 insertions(+), 43 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 150512c7..9303fc32 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -10,10 +10,6 @@ c_stdlib_version: - '2.17' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +25,7 @@ libgrpc: libprotobuf: - 6.31.1 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -47,7 +43,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 2da1f3c2..13f9b90e 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -10,10 +10,6 @@ c_stdlib_version: - '2.17' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +25,7 @@ libgrpc: libprotobuf: - 6.31.1 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -47,7 +43,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 35cc6b77..7cea63ff 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -10,10 +10,6 @@ c_stdlib_version: - '2.17' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +25,7 @@ libgrpc: libprotobuf: - 6.31.1 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -47,7 +43,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e4c4295e..391b43da 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -14,10 +14,6 @@ c_stdlib_version: - '11.0' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -33,7 +29,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -51,7 +47,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0fa6ef90..d0b3e04f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -14,10 +14,6 @@ c_stdlib_version: - '11.0' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -33,7 +29,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -51,7 +47,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 6cdeb8b4..8a2d7a04 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -6,10 +6,6 @@ c_stdlib: - vs channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge -- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cxx_compiler: @@ -21,7 +17,7 @@ libgrpc: libprotobuf: - 6.31.1 openssl: -- '3' +- '3.5' pin_run_as_build: python: min_pin: x.x @@ -36,8 +32,5 @@ re2: - 2025.08.12 target_platform: - win-64 -zip_keys: -- - python - - channel_sources zlib: - '1' From 11c9740823324e9299025e43d0e91ab53e5a8624 Mon Sep 17 00:00:00 2001 From: Martin Holoubek Date: Fri, 5 Dec 2025 13:55:16 +0100 Subject: [PATCH 3/3] patch 0009: also remove utf8_range_lib from grpc_plugin_support target gRPC 1.76.0 added utf8_range_lib as a dependency of grpc_plugin_support, which wasn't present in v1.74.1. Since patch 0009 unvendors utf8_range to use protobuf's version, this new reference needs to be removed too, otherwise linking fails with 'cannot find -lutf8_range_lib'. --- ...or-upb-and-utf8_range-use-protobuf-s-version.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 fb378d46..d499fe18 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 @@ -719,6 +719,17 @@ index ed6a33c..462bec4 100644 if(gRPC_BUILD_TESTS) +@@ -6330,10 +5665,9 @@ target_include_directories(grpc_plugin_support + ${_gRPC_PROTO_GENS_DIR} + ) + target_link_libraries(grpc_plugin_support + ${_gRPC_ALLTARGETS_LIBRARIES} +- utf8_range_lib + ${_gRPC_ZLIB_LIBRARIES} + absl::algorithm_container + absl::base + absl::config + diff --git a/cmake/upb.cmake b/cmake/upb.cmake index 9156e5f..e6fa819 100644 --- a/cmake/upb.cmake