diff options
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/monitor-option.patch')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/monitor-option.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch index 7d43a79e21..b7ee0701b1 100644 --- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch +++ b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch | |||
@@ -1,21 +1,30 @@ | |||
1 | From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 4 Oct 2016 16:37:53 +0100 | ||
4 | Subject: [PATCH 4/6] systemtap: rationalise dependencies | ||
5 | |||
1 | Add an option to explicitly disable the monitor (and therefore the dependency on | 6 | Add an option to explicitly disable the monitor (and therefore the dependency on |
2 | json-c and ncurses). | 7 | json-c and ncurses). |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
6 | 11 | ||
12 | --- | ||
13 | configure.ac | 5 ++++- | ||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
15 | |||
7 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
8 | index cd781a2..e56079a 100644 | 17 | index 6bd0c5fc4..2ea9b3cbf 100644 |
9 | --- a/configure.ac | 18 | --- a/configure.ac |
10 | +++ b/configure.ac | 19 | +++ b/configure.ac |
11 | @@ -570,13 +574,16 @@ dnl See if we have enough libraries and tools to build the virt server | 20 | @@ -752,13 +752,16 @@ dnl We want either (or both) python probe support. |
12 | fi | 21 | AM_CONDITIONAL([HAVE_PYTHON_PROBES], |
13 | AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"]) | 22 | [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"]) |
14 | 23 | ||
15 | +AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) | 24 | +AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) |
16 | +if test "$enable_monitor" != "no"; then | 25 | +if test "$enable_monitor" != "no"; then |
17 | dnl Check for presence of json-c and ncurses for use in monitor mode | 26 | dnl Check for presence of json-c and ncurses for use in monitor mode |
18 | PKG_CHECK_MODULES([jsonc], [json-c], [have_jsonc=yes], [have_jsonc=no]) | 27 | PKG_CHECK_MODULES([jsonc], [json-c >= 0.12], [have_jsonc=yes], [have_jsonc=no]) |
19 | PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) | 28 | PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) |
20 | -AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) | 29 | -AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) |
21 | if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then | 30 | if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then |
@@ -23,6 +32,9 @@ index cd781a2..e56079a 100644 | |||
23 | fi | 32 | fi |
24 | +fi | 33 | +fi |
25 | +AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) | 34 | +AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) |
26 | 35 | ||
27 | AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ | 36 | AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ |
28 | old_CFLAGS="$CFLAGS" | 37 | old_CFLAGS="$CFLAGS" |
38 | -- | ||
39 | 2.11.0 | ||
40 | |||