diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-ust')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch | 28 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 |
2 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch deleted file mode 100644 index cc3220ac18..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Tue, 2 Jul 2013 10:25:06 -0300 | ||
4 | Subject: [PATCH] build: Fix out-of-tree build | ||
5 | |||
6 | To allow out-of-tree build, we need to include top_buildir in include | ||
7 | directories or the generated config header won't be found. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
12 | --- | ||
13 | liblttng-ust-comm/Makefile.am | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am | ||
17 | index 2ae997c..065dbbf 100644 | ||
18 | --- a/liblttng-ust-comm/Makefile.am | ||
19 | +++ b/liblttng-ust-comm/Makefile.am | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -AM_CPPFLAGS = -I$(top_srcdir)/include | ||
22 | +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include | ||
23 | |||
24 | noinst_LTLIBRARIES = liblttng-ust-comm.la | ||
25 | |||
26 | -- | ||
27 | 1.8.3.1 | ||
28 | |||
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 deleted file mode 100644 index 458a8d47e6..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | liblttng_ust.la should depend on liblttng-ust-tracepoint.la | ||
2 | |||
3 | liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise | ||
4 | there maybe a parallel build issue: | ||
5 | |||
6 | ld: cannot find -llttng-ust-tracepoint | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | --- | ||
12 | liblttng-ust/Makefile.am | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --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 | -- | ||
29 | 1.7.11.2 | ||
30 | |||