From 9e6c4fbaca806671687c460763c79e452f039d57 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 4 Jul 2013 00:04:48 +0200 Subject: lttng-tools: add missing dependency on util-linux for libuuid Fixes: http://autobuild.buildroot.org/results/76a/76a91bd139a93f63e17732c9a933664e8e5d3fe1/build-end.log. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/lttng-tools/Config.in | 9 ++++++--- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'package/lttng-tools') diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in index 67734753c..c196e4b63 100644 --- a/package/lttng-tools/Config.in +++ b/package/lttng-tools/Config.in @@ -2,9 +2,12 @@ config BR2_PACKAGE_LTTNG_TOOLS bool "lttng-tools" select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_POPT + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID # liburcu only works on some architectures and requires thread support depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64 depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS help Userspace utilities for the LTTng 2.0 tracing @@ -24,6 +27,6 @@ config BR2_PACKAGE_LTTNG_TOOLS http://lttng.org -comment "lttng-tools needs LARGEFILE and threads support" - depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS - +comment "lttng-tools needs LARGEFILE, threads and wchar support" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 2e9f93613..d48bc0a90 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -18,7 +18,7 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE # Since the 2.1.0 release, lttng-tools depends on flex and bison, # but they are not added to the dependency list since they are # already Buildroot dependencies. -LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace +LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace util-linux LTTNG_AUTORECONF = YES -- cgit v1.2.3