From 179e2495523d2e4d6c16080b87614f53e0e8cbfa Mon Sep 17 00:00:00 2001
From: Will Ayd <william.ayd@icloud.com>
Date: Mon, 15 Dec 2025 12:11:41 -0500
Subject: [PATCH] Use @pitrou solution to abseil symbol visibility issue

---
 cpp/examples/arrow/flight_grpc_example.cc     | 21 +++++++++++++++++++
 .../flight/transport/grpc/customize_grpc.h    | 20 ++++++++++++++++++
 .../flight/transport/grpc/grpc_client.cc      |  2 ++
 .../flight/transport/grpc/grpc_server.cc      |  2 ++
 4 files changed, 45 insertions(+)

diff --git a/cpp/examples/arrow/flight_grpc_example.cc b/cpp/examples/arrow/flight_grpc_example.cc
index 1e706560818..3aea91dadae 100644
--- a/cpp/examples/arrow/flight_grpc_example.cc
+++ b/cpp/examples/arrow/flight_grpc_example.cc
@@ -22,6 +22,27 @@
 #include <arrow/api.h>
 #include <arrow/flight/api.h>
 #include <gflags/gflags.h>
+
+// HACK: Workaround absl::Mutex ABI incompatibility by making sure the
+// non-debug version of Abseil is included
+// (https://github.com/conda-forge/abseil-cpp-feedstock/issues/104,
+//  https://github.com/abseil/abseil-cpp/issues/1624)
+
+#if __has_include(<absl/synchronization/mutex.h>)
+
+#  ifndef NDEBUG
+#    define ARROW_NO_NDEBUG
+#    define NDEBUG
+#  endif
+
+#  include <absl/synchronization/mutex.h>
+
+#  ifdef ARROW_NO_NDEBUG
+#    undef NDEBUG
+#  endif
+
+#endif
+
 #include <grpc++/grpc++.h>
 
 #include "examples/arrow/helloworld.grpc.pb.h"
diff --git a/cpp/src/arrow/flight/transport/grpc/customize_grpc.h b/cpp/src/arrow/flight/transport/grpc/customize_grpc.h
index 153aa5ae1da..7836f7c161d 100644
--- a/cpp/src/arrow/flight/transport/grpc/customize_grpc.h
+++ b/cpp/src/arrow/flight/transport/grpc/customize_grpc.h
@@ -20,6 +20,26 @@
 #include <limits>
 #include <memory>
 
+// HACK: Workaround absl::Mutex ABI incompatibility by making sure the
+// non-debug version of Abseil is included
+// (https://github.com/conda-forge/abseil-cpp-feedstock/issues/104,
+//  https://github.com/abseil/abseil-cpp/issues/1624)
+
+#if __has_include(<absl/synchronization/mutex.h>)
+
+#  ifndef NDEBUG
+#    define ARROW_NO_NDEBUG
+#    define NDEBUG
+#  endif
+
+#  include <absl/synchronization/mutex.h>
+
+#  ifdef ARROW_NO_NDEBUG
+#    undef NDEBUG
+#  endif
+
+#endif
+
 #include "arrow/flight/platform.h"
 #include "arrow/flight/type_fwd.h"
 #include "arrow/flight/visibility.h"
diff --git a/cpp/src/arrow/flight/transport/grpc/grpc_client.cc b/cpp/src/arrow/flight/transport/grpc/grpc_client.cc
index 0f489fd1657..6cf3242b070 100644
--- a/cpp/src/arrow/flight/transport/grpc/grpc_client.cc
+++ b/cpp/src/arrow/flight/transport/grpc/grpc_client.cc
@@ -28,6 +28,8 @@
 #include <unordered_map>
 #include <utility>
 
+#include "arrow/flight/transport/grpc/customize_grpc.h"
+
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/client_callback.h>
 #if defined(GRPC_NAMESPACE_FOR_TLS_CREDENTIALS_OPTIONS)
diff --git a/cpp/src/arrow/flight/transport/grpc/grpc_server.cc b/cpp/src/arrow/flight/transport/grpc/grpc_server.cc
index 28fc736aa00..3cc854b58fe 100644
--- a/cpp/src/arrow/flight/transport/grpc/grpc_server.cc
+++ b/cpp/src/arrow/flight/transport/grpc/grpc_server.cc
@@ -25,6 +25,8 @@
 #include <unordered_map>
 #include <utility>
 
+#include "arrow/flight/transport/grpc/customize_grpc.h"
+
 #include <grpcpp/grpcpp.h>
 
 #include "arrow/buffer.h"