summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-02-26 17:24:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-26 08:00:09 -0800
commitb947dbc72b3cd03901112c1bab6ac0b81f1b374f (patch)
tree0fb255d687ca1a9c412603c73e93ffef771b7531
parent0c243a550f5a0e539823fe168bcc7b2bbb9f19e1 (diff)
downloadopenembedded-core-b947dbc72b3cd03901112c1bab6ac0b81f1b374f.tar.gz
openembedded-core-b947dbc72b3cd03901112c1bab6ac0b81f1b374f.tar.bz2
openembedded-core-b947dbc72b3cd03901112c1bab6ac0b81f1b374f.zip
lttng-ust: cannot find -llttng-ust-tracepoint
liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise there maybe a parallel build issue when building liblttng_ust.la: ld: cannot find -llttng-ust-tracepoint [YOCTO #3934] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch30
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb4
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
new file mode 100644
index 0000000000..458a8d47e6
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
@@ -0,0 +1,30 @@
+liblttng_ust.la should depend on liblttng-ust-tracepoint.la
+
+liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise
+there maybe a parallel build issue:
+
+ld: cannot find -llttng-ust-tracepoint
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ liblttng-ust/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
+--- a/liblttng-ust/Makefile.am
++++ b/liblttng-ust/Makefile.am
+@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \
+ -llttng-ust-tracepoint \
+ $(top_builddir)/snprintf/libustsnprintf.la \
+ $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
+- liblttng-ust-runtime.la liblttng-ust-support.la
++ liblttng-ust-runtime.la liblttng-ust-support.la \
++ liblttng-ust-tracepoint.la
+
+ if LTTNG_UST_BUILD_WITH_LIBUUID
+ liblttng_ust_la_LIBADD += -luuid
+--
+1.7.11.2
+
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
index 20c8b3d7cb..6c2ca04bcc 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
@@ -22,7 +22,9 @@ PV = "2.1.0"
PR = "r0"
PE = "2"
-SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"
+SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
+ file://depends-liblttng-ust-tracepoin.patch \
+ "
S = "${WORKDIR}/git"