* [PATCH lttng-tools] fix: tests: link libpause_consumer on liblttng-ctl
@ 2019-03-19 20:56 Michael Jeanson
0 siblings, 0 replies; 3+ messages in thread
From: Michael Jeanson @ 2019-03-19 20:56 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
This preload test library uses symbols from liblttng-ctl which are
resolved when preloaded by GLIBC but not by MUSL.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
tests/regression/tools/notification/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
index 33e95886..b869bdb1 100644
--- a/tests/regression/tools/notification/Makefile.am
+++ b/tests/regression/tools/notification/Makefile.am
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH lttng-tools] fix: tests: link libpause_consumer on liblttng-ctl
[not found] <20190319205603.15707-1-mjeanson@efficios.com>
2019-03-20 15:01 ` Jonathan Rajotte-Julien
@ 2019-03-29 18:18 ` Jérémie Galarneau
1 sibling, 0 replies; 3+ messages in thread
From: Jérémie Galarneau @ 2019-03-29 18:18 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, jgalar
Merged in master, stable-2.11, and stable-2.10.
Thanks!
Jérémie
On Tue, Mar 19, 2019 at 04:56:03PM -0400, Michael Jeanson wrote:
> This preload test library uses symbols from liblttng-ctl which are
> resolved when preloaded by GLIBC but not by MUSL.
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> tests/regression/tools/notification/Makefile.am | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
> index 33e95886..b869bdb1 100644
> --- a/tests/regression/tools/notification/Makefile.am
> +++ b/tests/regression/tools/notification/Makefile.am
> @@ -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
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH lttng-tools] fix: tests: link libpause_consumer on liblttng-ctl
[not found] <20190319205603.15707-1-mjeanson@efficios.com>
@ 2019-03-20 15:01 ` Jonathan Rajotte-Julien
2019-03-29 18:18 ` Jérémie Galarneau
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Rajotte-Julien @ 2019-03-20 15:01 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, jgalar
On Tue, Mar 19, 2019 at 04:56:03PM -0400, Michael Jeanson wrote:
> This preload test library uses symbols from liblttng-ctl which are
> resolved when preloaded by GLIBC but not by MUSL.
>
Tested-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> tests/regression/tools/notification/Makefile.am | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
> index 33e95886..b869bdb1 100644
> --- a/tests/regression/tools/notification/Makefile.am
> +++ b/tests/regression/tools/notification/Makefile.am
> @@ -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
>
> --
> 2.17.1
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
--
Jonathan Rajotte-Julien
EfficiOS
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-29 18:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-19 20:56 [PATCH lttng-tools] fix: tests: link libpause_consumer on liblttng-ctl Michael Jeanson
[not found] <20190319205603.15707-1-mjeanson@efficios.com>
2019-03-20 15:01 ` Jonathan Rajotte-Julien
2019-03-29 18:18 ` Jérémie Galarneau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.