From 4f3579829957307efb3f2ea82354fdd4491956b8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 27 May 2023 14:51:49 +1100 Subject: [PATCH] add abseil linkage --- recipe/meta.yaml | 1 + ...1-cross_compile_grpc_cpp_plugin_path.patch | 2 +- ...-missing-shared-library-dependencies.patch | 2 +- .../0003-use-Base64Escape-from-abseil.patch | 2 +- .../0004-add-necessary-abseil-linkage.patch | 31 +++++++++++++++++++ 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 recipe/patches/0004-add-necessary-abseil-linkage.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d03ad05..bf089a3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,6 +25,7 @@ source: - patches/0001-cross_compile_grpc_cpp_plugin_path.patch # [build_platform != target_platform] - patches/0002-add-missing-shared-library-dependencies.patch - patches/0003-use-Base64Escape-from-abseil.patch # [libprotobuf != "3.21"] + - patches/0004-add-necessary-abseil-linkage.patch build: number: 1 diff --git a/recipe/patches/0001-cross_compile_grpc_cpp_plugin_path.patch b/recipe/patches/0001-cross_compile_grpc_cpp_plugin_path.patch index 276d813..7a21bca 100644 --- a/recipe/patches/0001-cross_compile_grpc_cpp_plugin_path.patch +++ b/recipe/patches/0001-cross_compile_grpc_cpp_plugin_path.patch @@ -1,7 +1,7 @@ From 863fcc27b2d95b3ba99e166eeebf154d66eea434 Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 14 Dec 2021 15:47:51 -0500 -Subject: [PATCH 1/3] cross_compile_grpc_cpp_plugin_path +Subject: [PATCH 1/4] cross_compile_grpc_cpp_plugin_path --- cmake/opentelemetry-proto.cmake | 17 +++++++---------- diff --git a/recipe/patches/0002-add-missing-shared-library-dependencies.patch b/recipe/patches/0002-add-missing-shared-library-dependencies.patch index 11407f3..6eaa0b6 100644 --- a/recipe/patches/0002-add-missing-shared-library-dependencies.patch +++ b/recipe/patches/0002-add-missing-shared-library-dependencies.patch @@ -1,7 +1,7 @@ From 7333b54233024442aa0cf36b0b9dc0400ccb7a31 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Tue, 18 Apr 2023 11:52:23 -0700 -Subject: [PATCH 2/3] add missing shared library dependencies +Subject: [PATCH 2/4] add missing shared library dependencies Co-Authored-By: H. Vetinari --- diff --git a/recipe/patches/0003-use-Base64Escape-from-abseil.patch b/recipe/patches/0003-use-Base64Escape-from-abseil.patch index 01955c0..96826a2 100644 --- a/recipe/patches/0003-use-Base64Escape-from-abseil.patch +++ b/recipe/patches/0003-use-Base64Escape-from-abseil.patch @@ -1,7 +1,7 @@ From 9ed8306106cffe0c52083778532920a65d25750d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 27 May 2023 02:51:30 +1100 -Subject: [PATCH 3/3] use Base64Escape from abseil +Subject: [PATCH 3/4] use Base64Escape from abseil has been removed from protobuf --- diff --git a/recipe/patches/0004-add-necessary-abseil-linkage.patch b/recipe/patches/0004-add-necessary-abseil-linkage.patch new file mode 100644 index 0000000..167b981 --- /dev/null +++ b/recipe/patches/0004-add-necessary-abseil-linkage.patch @@ -0,0 +1,31 @@ +From 52f6372130918e4b5443c3abcd0fae8b69587603 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sat, 27 May 2023 14:50:43 +1100 +Subject: [PATCH 4/4] add necessary abseil linkage + +--- + exporters/otlp/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt +index 58c09f89..42afc469 100644 +--- a/exporters/otlp/CMakeLists.txt ++++ b/exporters/otlp/CMakeLists.txt +@@ -102,7 +102,7 @@ if(WITH_OTLP_GRPC) + opentelemetry_exporter_otlp_grpc_metrics + PUBLIC opentelemetry_otlp_recordable + opentelemetry_exporter_otlp_grpc_client +- PRIVATE gRPC::grpc++) ++ PRIVATE gRPC::grpc++ absl::strings) + + list(APPEND OPENTELEMETRY_OTLP_TARGETS + opentelemetry_exporter_otlp_grpc_metrics) +@@ -118,7 +118,7 @@ if(WITH_OTLP_HTTP) + opentelemetry_exporter_otlp_http_client + PUBLIC opentelemetry_sdk opentelemetry_ext opentelemetry_common + PRIVATE opentelemetry_proto opentelemetry_http_client_curl +- nlohmann_json::nlohmann_json) ++ nlohmann_json::nlohmann_json absl::strings) + if(nlohmann_json_clone) + add_dependencies(opentelemetry_exporter_otlp_http_client + nlohmann_json::nlohmann_json)