summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1liblttng_ust.la should depend on liblttng-ust-tracepoint.la
2
3liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise
4there maybe a parallel build issue:
5
6ld: cannot find -llttng-ust-tracepoint
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 liblttng-ust/Makefile.am | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
16--- a/liblttng-ust/Makefile.am
17+++ b/liblttng-ust/Makefile.am
18@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \
19 -llttng-ust-tracepoint \
20 $(top_builddir)/snprintf/libustsnprintf.la \
21 $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
22- liblttng-ust-runtime.la liblttng-ust-support.la
23+ liblttng-ust-runtime.la liblttng-ust-support.la \
24+ liblttng-ust-tracepoint.la
25
26 if LTTNG_UST_BUILD_WITH_LIBUUID
27 liblttng_ust_la_LIBADD += -luuid
28--
291.7.11.2
30
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"
22PR = "r0" 22PR = "r0"
23PE = "2" 23PE = "2"
24 24
25SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" 25SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
26 file://depends-liblttng-ust-tracepoin.patch \
27 "
26 28
27S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"
28 30