diff --git a/grpc.changes b/grpc.changes index 93cc2f0..b1bd8e8 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 12 14:22:59 UTC 2025 - Jan Engelhardt + +- Add telemetry.patch + ------------------------------------------------------------------- Sun Feb 9 22:37:18 UTC 2025 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index 203f07e..4238442 100644 --- a/grpc.spec +++ b/grpc.spec @@ -31,6 +31,7 @@ Source2: %name-rpmlintrc Patch1: terminate.patch Patch2: link-failure.patch Patch3: return-values.patch +Patch4: telemetry.patch Patch14: ARM-Unaligned-access-fixes.patch Patch15: Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch BuildRequires: abseil-cpp-devel >= 20240722 @@ -130,7 +131,7 @@ This subpackage contains source code of the gRPC reference implementation. %prep %autosetup -N -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 find "." -type f -exec grep -l '/usr/bin/python' {} + | xargs -r perl -i -lpe \ 's{#! ?/usr/bin/python\S*}{#!/usr/bin/python3}g;' diff --git a/telemetry.patch b/telemetry.patch new file mode 100644 index 0000000..419e3a1 --- /dev/null +++ b/telemetry.patch @@ -0,0 +1,22 @@ +From: +Date: 2025-02-12 15:22:18.058482440 +0100 + +CMakeLists.txt is using a bundled copy of otel, so there is no .pc file to depend on. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: grpc-1.70.1/CMakeLists.txt +=================================================================== +--- grpc-1.70.1.orig/CMakeLists.txt ++++ grpc-1.70.1/CMakeLists.txt +@@ -51301,7 +51301,7 @@ generate_pkgconfig( + "gRPC++ OpenTelemetry Plugin" + "OpenTelemetry Plugin for gRPC C++" + "${gRPC_CPP_VERSION}" +- "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc grpc++ opentelemetry_api" ++ "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc grpc++" + "libcares openssl re2 zlib" + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"