Skip to contentSkip to conversation

fix: tests: link libpause_consumer on liblttng-ctl

PATCH Jonathan Rajotte-Julien 2 participants 2 messages Mar 20, 2019 – Mar 29, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jonathan Rajotte-Julien

author Tested-by
#1 lore raw
Quoted 3 lines · Michael Jeanson

This preload test library uses symbols from liblttng-ctl which are resolved when preloaded by GLIBC but not by MUSL.

Quoted 28 lines
---
 tests/regression/tools/notification/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/regression/tools/notification/Makefile.am +4 -1
index 33e95886..b869bdb1 100644
@@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 			   -rpath $(abs_builddir)
 
 libpause_consumer_la_SOURCES = consumer_testpoints.c
-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
+libpause_consumer_la_LIBADD = \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+	$(DL_LIBS)
 libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
 noinst_LTLIBRARIES = libpause_consumer.la
 
Signature · 6 lines
2.17.1

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
#2 lore raw
In reply to a message not in the archive

Merged in master, stable-2.11, and stable-2.10.

Thanks!
Jérémie

Quoted 27 lines · Michael Jeanson

This preload test library uses symbols from liblttng-ctl which are resolved when preloaded by GLIBC but not by MUSL.

---
 tests/regression/tools/notification/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/regression/tools/notification/Makefile.am +4 -1
index 33e95886..b869bdb1 100644
@@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 			   -rpath $(abs_builddir)
 
 libpause_consumer_la_SOURCES = consumer_testpoints.c
-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
+libpause_consumer_la_LIBADD = \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+	$(DL_LIBS)
 libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
 noinst_LTLIBRARIES = libpause_consumer.la
 
Signature · 1 line
2.17.1