add abseil linkage

conda-forge · May 27, 2023 · b0f0880 · b0f0880
1 parent f6a99d9
commit b0f0880
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 From 863fcc27b2d95b3ba99e166eeebf154d66eea434 Mon Sep 17 00:00:00 2001
 From: David Li <li.davidm96@gmail.com>
 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
@@ -1,7 +1,7 @@
 From 7333b54233024442aa0cf36b0b9dc0400ccb7a31 Mon Sep 17 00:00:00 2001
 From: Will Jones <willjones127@gmail.com>
 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 <h.vetinari@gmx.com>
 ---

diff --git 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" <h.vetinari@gmx.com>
 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
@@ -0,0 +1,22 @@
+From 7f3c459ec9db6619263fa3c207e0de6a6eba9089 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <h.vetinari@gmx.com>
+Date: Sat, 27 May 2023 14:50:43 +1100
+Subject: [PATCH 4/4] add necessary abseil linkage
+
+---
+ exporters/otlp/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt
+index 58c09f89..76ae901b 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)