Patchwork [045/131] babeltrace: Fix RDEPENDS/DEPENDS and split into packages

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Jan. 14, 2014, 12:33 p.m.
Message ID <609c7a52b834fc6fcb0d4e6330e7c9f9b7869724.1389702652.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/310630/
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/babeltrace.inc | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Patch

diff --git a/recipes/lttng/babeltrace.inc b/recipes/lttng/babeltrace.inc
index 8132ba6..93c1fe2 100644
--- a/recipes/lttng/babeltrace.inc
+++ b/recipes/lttng/babeltrace.inc
@@ -1,19 +1,39 @@ 
 # -*- mode:python; -*-
 SUMMARY = "Babeltrace - Trace Format Babel Tower"
-DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
+DESCRIPTION = "Babeltrace provides trace read and write libraries in host side,\
+	 as well as a trace converter, which used to convert LTTng 2.0 traces \
+	 into human-readable log."
 HOMEPAGE = "http://www.efficios.com/babeltrace/"
 LICENSE = "MIT & GPLv2"
 
 RECIPE_TYPES = "machine sdk"
 
-inherit autotools-autoreconf pkgconfig make-vpath
+inherit autotools-autoreconf pkgconfig make-vpath auto-package-libs
 
 SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2"
 
-DEPENDS += "libuuid libpopt libgmodule ${DEPENDS_LIBC}"
+DEPENDS += "libuuid libpopt libgmodule-2.0 ${DEPENDS_LIBC}"
+AUTO_PACKAGE_LIBS = "babeltrace babeltrace-ctf-metadata babeltrace-ctf-text \
+		babeltrace-ctf babeltrace-dummy"
+AUTO_PACKAGE_LIBS_DEV_DEPENDS += "libc libdl libglib-2.0 libgmodule-2.0 libpcre \
+				libpopt libpthread"
+AUTO_PACKAGE_LIBS_RDEPENDS += "libc libdl libglib-2.0 libgmodule-2.0 libpcre \
+				libpopt libpthread"
 DEPENDS_LIBC = "librt"
 DEPENDS_LIBC:HOST_LIBC_mingw = ""
-RDEPENDS_${PN} += "libgmodule libpopt libuuid libpcre libpthread libc libglib libdl ${DEPENDS_LIBC}"
-
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN} ${PN}-dev ${PN}-locale"
-FILES_${PN} += "${libdir}/*.so"
+DEPENDS_${PN} += "libbabeltrace libbabeltrace-ctf \
+		libbabeltrace-ctf-metadata libbabeltrace-ctf-text \
+		libbabeltrace-dummy libc libdl libglib-2.0 libgmodule-2.0 \
+		libpcre libpopt libpthread libuuid"
+RDEPENDS_${PN} += "libgmodule-2.0 libpopt libuuid libpcre libpthread libc \
+		libglib-2.0 libdl ${DEPENDS_LIBC} libbabeltrace libbabeltrace-ctf \
+		libbabeltrace-ctf-metadata libbabeltrace-ctf-text \
+		libbabeltrace-dummy"
+DEPENDS_${PN}-libbabeltrace-ctf-metadata += "libbabeltrace"
+RDEPENDS_${PN}-libbabeltrace-ctf-metadata += "libbabeltrace"
+DEPENDS_${PN}-libbabeltrace-ctf += "libbabeltrace libuuid"
+RDEPENDS_${PN}-libbabeltrace-ctf += "libbabeltrace libuuid"
+DEPENDS_${PN}-libbabeltrace-ctf-text += "libbabeltrace libbabeltrace-ctf libuuid"
+RDEPENDS_${PN}-libbabeltrace-ctf-text += "libbabeltrace libbabeltrace-ctf libuuid"
+DEPENDS_${PN}-libbabeltrace-dummy += "libbabeltrace"
+RDEPENDS_${PN}-libbabeltrace-dummy += "libbabeltrace"