* Re: [PATCH lttng-tools stable-2.11] fix: check for lttng-ust >= 2.11 at configure
[not found] <20191023150834.6885-1-mjeanson@efficios.com>
@ 2019-10-24 20:07 ` Jérémie Galarneau
0 siblings, 0 replies; 2+ messages in thread
From: Jérémie Galarneau @ 2019-10-24 20:07 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, jgalar
Merged in master and stable-2.11. Thanks!
Jérémie
On Wed, Oct 23, 2019 at 11:08:34AM -0400, Michael Jeanson wrote:
> We don't support building lttng-tools against an older version of
> lttng-ust, make this check explicitly at configure.
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> configure.ac | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 5c4073ef8..357e2b888 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -562,14 +562,13 @@ AC_ARG_WITH([lttng-ust],
>
> AS_IF([test "x$with_lttng_ust" = "xyes"],
> [
> - AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
> + AC_CHECK_LIB([lttng-ust-ctl], [lttng_ust_enum_get_from_desc],
> [
> AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1])
> ],
> [
> - AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.2.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
> - ],
> - [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl]
> + AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.11.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
> + ]
> )
> ]
> )
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH lttng-tools stable-2.11] fix: check for lttng-ust >= 2.11 at configure
@ 2019-10-23 15:08 Michael Jeanson
0 siblings, 0 replies; 2+ messages in thread
From: Michael Jeanson @ 2019-10-23 15:08 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
We don't support building lttng-tools against an older version of
lttng-ust, make this check explicitly at configure.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
configure.ac | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5c4073ef8..357e2b888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -562,14 +562,13 @@ AC_ARG_WITH([lttng-ust],
AS_IF([test "x$with_lttng_ust" = "xyes"],
[
- AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
+ AC_CHECK_LIB([lttng-ust-ctl], [lttng_ust_enum_get_from_desc],
[
AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1])
],
[
- AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.2.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
- ],
- [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl]
+ AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.11.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
+ ]
)
]
)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-24 20:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20191023150834.6885-1-mjeanson@efficios.com>
2019-10-24 20:07 ` [PATCH lttng-tools stable-2.11] fix: check for lttng-ust >= 2.11 at configure Jérémie Galarneau
2019-10-23 15:08 Michael Jeanson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).