summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-07-03 22:04:48 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-07-04 09:49:57 (GMT)
commit9e6c4fbaca806671687c460763c79e452f039d57 (patch)
tree1a99e2fdd53ae5af41f57e6a9829220defa13621
parent30224b8ee221e273ca0a0128c5f487df23167b51 (diff)
downloadbuildroot-9e6c4fbaca806671687c460763c79e452f039d57.tar.gz
buildroot-9e6c4fbaca806671687c460763c79e452f039d57.tar.bz2
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 <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/lttng-tools/Config.in9
-rw-r--r--package/lttng-tools/lttng-tools.mk2
2 files changed, 7 insertions, 4 deletions
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 6773475..c196e4b 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 2e9f936..d48bc0a 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