summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch39
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb3
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
3 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch b/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
new file mode 100644
index 0000000000..b4f2fbc066
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
@@ -0,0 +1,39 @@
1From 5eb10d90af9178edb65e6091ae939d1b5b19bb78 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 23 Sep 2014 04:47:10 -0400
4Subject: [PATCH] systemtap: allow to disable libvirt
5
6Upstream-Status: Pending
7
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9---
10 configure.ac | 13 +++++++++----
11 1 file changed, 9 insertions(+), 4 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index a631ae7..cb4885b 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -525,10 +525,15 @@ dnl Check for the libvirt and libxml2 devel packages
18
19 dnl We require libvirt >= 1.0.2 because stapvirt relies on the
20 dnl virDomainOpenChannel function, which was implemented in 1.0.2.
21-PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
22- have_libvirt=yes
23- AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
24- ], [have_libvirt=no])
25+AC_ARG_ENABLE([libvirt],
26+ AS_HELP_STRING([--disable-libvirt], [Do not use libvirt even if present]))
27+
28+if test "$enable_libvirt" != no; then
29+ PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
30+ have_libvirt=yes
31+ AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
32+ ], [have_libvirt=no])
33+fi
34 AM_CONDITIONAL([HAVE_LIBVIRT], [test "${have_libvirt}" = "yes"])
35 PKG_CHECK_MODULES([libxml2], [libxml-2.0], [
36 have_libxml2=yes
37--
381.7.9.5
39
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 488d417150..d0dd42a643 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -20,6 +20,9 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
20 20
21EXTRA_OECONF += "${STAP_DOCS} " 21EXTRA_OECONF += "${STAP_DOCS} "
22 22
23PACKAGECONFIG ??= ""
24PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt"
25
23inherit autotools gettext pkgconfig 26inherit autotools gettext pkgconfig
24 27
25BBCLASSEXTEND = "native nativesdk" 28BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 33aa136f74..f81e8baf86 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -8,6 +8,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \
8 file://obsolete_automake_macros.patch \ 8 file://obsolete_automake_macros.patch \
9 file://system_map_location.patch \ 9 file://system_map_location.patch \
10 file://tapset-linux-sendfile-syscall.patch \ 10 file://tapset-linux-sendfile-syscall.patch \
11 file://configure-allow-to-disable-libvirt.patch \
11 " 12 "
12 13
13# systemtap doesn't support mips 14# systemtap doesn't support mips