| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 7244eac44be929fabd6ed1333f96929ef8da564f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> |
| 3 | Date: Tue, 19 Mar 2019 17:56:49 +0000 |
| 4 | Subject: [PATCH] fix: tests: link libpause_consumer on liblttng-ctl |
| 5 | |
| 6 | This preload test library uses symbols from liblttng-ctl which are |
| 7 | resolved when preloaded by GLIBC but not by MUSL. |
| 8 | |
| 9 | Upstream-Status: Accepted [f667fbd7f8b9512f9943edb2597c226fcc424ee9] |
| 10 | Backported to 2.11 and 2.10. |
| 11 | |
| 12 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 13 | --- |
| 14 | tests/regression/tools/notification/Makefile.am | 5 ++++- |
| 15 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am |
| 18 | index 41adc69..a352bb8 100644 |
| 19 | --- a/tests/regression/tools/notification/Makefile.am |
| 20 | +++ b/tests/regression/tools/notification/Makefile.am |
| 21 | @@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \ |
| 22 | -rpath $(abs_builddir) |
| 23 | |
| 24 | libpause_consumer_la_SOURCES = consumer_testpoints.c |
| 25 | -libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS) |
| 26 | +libpause_consumer_la_LIBADD = \ |
| 27 | + $(top_builddir)/src/common/libcommon.la \ |
| 28 | + $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ |
| 29 | + $(DL_LIBS) |
| 30 | libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) |
| 31 | noinst_LTLIBRARIES = libpause_consumer.la |
| 32 | |
| 33 | -- |
| 34 | 2.17.1 |
| 35 | |