[OE-core] [PATCH 1/1] lttng-ust: cannot find -llttng-ust-tracepoint

[Darren Hart]

Pulling in Tom as I don't have any experience with lttng.

On 02/26/2013 01:24 AM, Robert Yang wrote:
> 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 at windriver.com>
> ---
>  .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 ++++++++++++++++++++++
>  meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb       |  4 ++-
>  2 files changed, 33 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
> 
> 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 0000000..458a8d4
> --- /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 at 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 20c8b3d..6c2ca04 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"
>  
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel