From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 19 Nov 2014 22:01:01 +0000 (-0500)
Subject: Build fix: Apps defining _LGPL_SOURCE must link to urcu-bp
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=32f754b34658ed4bda092acc56ec3cdb28e4fe98

Build fix: Apps defining _LGPL_SOURCE must link to urcu-bp

Defining _LGPL_SOURCE causes lttng-ust tracepoint headers to
inline uses of userspace-rcu, which make linking against urcu
necessary.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/tools/filtering/Makefile.am b/tests/regression/tools/filtering/Makefile.am
index 7889c8791..b4f8d76f0 100644
--- a/tests/regression/tools/filtering/Makefile.am
+++ b/tests/regression/tools/filtering/Makefile.am
@@ -11,7 +11,7 @@ endif
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = gen-ust-events
 gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
-gen_ust_events_LDADD = -llttng-ust
+gen_ust_events_LDADD = -llttng-ust -lurcu-bp
 endif
 
 noinst_SCRIPTS = test_unsupported_op test_invalid_filter test_valid_filter
diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am
index 6ff204a66..84e58beed 100644
--- a/tests/regression/ust/multi-session/Makefile.am
+++ b/tests/regression/ust/multi-session/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 noinst_PROGRAMS = gen-nevents
 gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h
-gen_nevents_LDADD = -llttng-ust
+gen_nevents_LDADD = -llttng-ust -lurcu-bp
 
 noinst_SCRIPTS = test_multi_session
 EXTRA_DIST = test_multi_session
diff --git a/tests/utils/testapp/gen-ust-events/Makefile.am b/tests/utils/testapp/gen-ust-events/Makefile.am
index 1be58353c..0e726d11c 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -11,5 +11,5 @@ endif
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = gen-ust-events
 gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
-gen_ust_events_LDADD = -llttng-ust
+gen_ust_events_LDADD = -llttng-ust -lurcu-bp
 endif
diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am
index e11b5f36f..d62c06db9 100644
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
@@ -11,5 +11,5 @@ endif
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = gen-ust-nevents
 gen_ust_nevents_SOURCES = gen-ust-nevents.c tp.c tp.h
-gen_ust_nevents_LDADD = -llttng-ust
+gen_ust_nevents_LDADD = -llttng-ust -lurcu-bp
 endif