summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/monitor-option.patch')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/monitor-option.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
index b7ee0701b1..9313a5aba3 100644
--- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
@@ -13,18 +13,18 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
13 configure.ac | 5 ++++- 13 configure.ac | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-) 14 1 file changed, 4 insertions(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16Index: git/configure.ac
17index 6bd0c5fc4..2ea9b3cbf 100644 17===================================================================
18--- a/configure.ac 18--- git.orig/configure.ac
19+++ b/configure.ac 19+++ git/configure.ac
20@@ -752,13 +752,16 @@ dnl We want either (or both) python probe support. 20@@ -766,13 +766,16 @@ dnl We want either (or both) python prob
21 AM_CONDITIONAL([HAVE_PYTHON_PROBES], 21 AM_CONDITIONAL([HAVE_PYTHON_PROBES],
22 [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"]) 22 [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"])
23 23
24+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) 24+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor]))
25+if test "$enable_monitor" != "no"; then 25+if test "$enable_monitor" != "no"; then
26 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
27 PKG_CHECK_MODULES([jsonc], [json-c >= 0.12], [have_jsonc=yes], [have_jsonc=no]) 27 PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
28 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) 28 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
29-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"])
30 if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then 30 if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
@@ -35,6 +35,3 @@ index 6bd0c5fc4..2ea9b3cbf 100644
35 35
36 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ 36 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
37 old_CFLAGS="$CFLAGS" 37 old_CFLAGS="$CFLAGS"
38--
392.11.0
40