From: Mohamad Gebai <mgebai@suse.com>
Date: Thu, 7 Sep 2017 13:43:20 +0000 (-0400)
Subject: blkin: link against lttng-ust-fork
X-Git-Tag: v13.0.1~490^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9049a97d414332d0d37a80a05c44d76b8dd5e8a0;p=ceph.git

blkin: link against lttng-ust-fork

Tracing with LTTng doesn't work if an application clone()s other
threads. This is an LTTng-related issue and the fix is LD_PRELOAD'ing
liblttng-ust-fork, or linking against it.
We don't have this issue with "regular" tracepoints (see WITH_LTTNG)
because the tracepoints are loaded using dlopen() at runtime by each
Ceph process.

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd95362ae062..b23d270c6c36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,7 +358,7 @@ endif(WITH_DPDK)
 
 option(WITH_BLKIN "Use blkin to emit LTTng tracepoints for Zipkin" OFF)
 if(WITH_BLKIN)
-  set(BLKIN_LIBRARIES blkin lttng-ust)
+  set(BLKIN_LIBRARIES blkin ${LTTNGUST_LIBRARIES} lttng-ust-fork)
   include_directories(src/blkin/blkin-lib)
 endif(WITH_BLKIN)