summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch28
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb)6
2 files changed, 31 insertions, 3 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
new file mode 100644
index 0000000000..cc3220ac18
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
@@ -0,0 +1,28 @@
1From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 2 Jul 2013 10:25:06 -0300
4Subject: [PATCH] build: Fix out-of-tree build
5
6To allow out-of-tree build, we need to include top_buildir in include
7directories or the generated config header won't be found.
8
9Upstream-Status: Pending
10
11Signed-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
16diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
17index 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--
271.8.3.1
28
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
index 93852b0af6..d03f20701b 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
@@ -17,13 +17,13 @@ RPROVIDES_${PN} = "lttng2-ust"
17RREPLACES_${PN} = "lttng2-ust" 17RREPLACES_${PN} = "lttng2-ust"
18RCONFLICTS_${PN} = "lttng2-ust" 18RCONFLICTS_${PN} = "lttng2-ust"
19 19
20SRCREV = "3f7a0876566a432ad2cc2b27a2725641e36da92d" 20SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba"
21PV = "2.1.2" 21PV = "2.2.0"
22PR = "r0"
23PE = "2" 22PE = "2"
24 23
25SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \ 24SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
26 file://depends-liblttng-ust-tracepoin.patch \ 25 file://depends-liblttng-ust-tracepoin.patch \
26 file://build-Fix-out-of-tree-build.patch \
27 " 27 "
28 28
29S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"