Patchwork [065/131] lttng-ust: Fix DEPENDS/RDEPENDS for all packages

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Jan. 14, 2014, 12:33 p.m.
Message ID <c91abd46d5c1675799e986156c274e98851db8a4.1389702652.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/310644/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

christian.braunersorensen@prevas.dk - Jan. 14, 2014, 12:33 p.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 recipes/lttng/lttng-ust.inc | 46 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

Patch

diff --git a/recipes/lttng/lttng-ust.inc b/recipes/lttng/lttng-ust.inc
index 2255b85..7f16243 100644
--- a/recipes/lttng/lttng-ust.inc
+++ b/recipes/lttng/lttng-ust.inc
@@ -2,16 +2,48 @@  SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0"
 DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes."
 HOMEPAGE = "http://lttng.org/lttng2.0"
 
-inherit c++ autotools-autoreconf
+inherit c++ autotools-autoreconf auto-package-libs
 
-DEPENDS_LIBURCU ?= "liburcu"
-DEPENDS = "${DEPENDS_LIBURCU} util-linux libuuid librt libdl"
+DEPENDS_LIBURCU = "liburcu-cds liburcu-common liburcu-bp"
+DEPENDS = "${DEPENDS_LIBURCU} userspace-rcu-dev util-linux libuuid librt libdl"
 SRC_URI = "http://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2"
 
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN} ${PN}-dev ${PN}-locale ${PN}-demos"
+PACKAGES += "${PN}-demos"
 
 FILES_${PN}-demos = "/tmp/"
-FILES_${PN} += "${libdir}/*.so"
+#FILES_${PN} += "${libdir}/*.so"
 
-DEPENDS_${PN} = "${DEPENDS_LIBURCU}"
-RDEPENDS_${PN} = "${DEPENDS_LIBURCU}"
+DEPENDS_${PN} += "${DEPENDS_LIBURCU}"
+RDEPENDS_${PN} += "${DEPENDS_LIBURCU}"
+
+AUTO_PACKAGE_LIBS += "lttng-ust-ctl lttng-ust-cyg-profile-fast \
+			lttng-ust-cyg-profile lttng-ust-fork \
+			lttng-ust-libc-wrapper lttng-ust lttng-ust-tracepoint"
+AUTO_PACKAGE_LIBS_DEV_DEPENDS += "libc libpthread liburcu-bp liburcu-cds \
+			liburcu-common"
+AUTO_PACKAGE_LIBS_RDEPENDS += "libc libpthread liburcu-bp liburcu-cds \
+			liburcu-common"
+
+DEPENDS_${PN}-liblttng-ust-ctl += "librt"
+RDEPENDS_${PN}-liblttng-ust-ctl += "librt"
+
+DEPENDS_${PN}-liblttng-ust-cyg-profile-fast += "libdl liblttng-ust librt"
+RDEPENDS_${PN}-liblttng-ust-cyg-profile-fast += "libdl liblttng-ust librt"
+
+DEPENDS_${PN}-liblttng-ust-cyg-profile += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+RDEPENDS_${PN}-liblttng-ust-cyg-profile += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+
+DEPENDS_${PN}-liblttng-ust-fork += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+RDEPENDS_${PN}-liblttng-ust-fork += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+
+DEPENDS_${PN}-liblttng-ust-libc-wrapper += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+RDEPENDS_${PN}-liblttng-ust-libc-wrapper += "libdl liblttng-ust \
+			liblttng-ust-tracepoint librt"
+
+DEPENDS_${PN}-liblttng-ust += "liblttng-ust-tracepoint librt"
+RDEPENDS_${PN}-liblttng-ust += "liblttng-ust-tracepoint librt"