mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 23:39:40 +01:00
941da957f9
Upgrade systemtap from 3.2 to 3.3: Removed all backported patches. Removed "remove quotes around -I include" pending patch since 3.3 got similar fix already. Resolved merge conflict in and regenerated monitor-option.patch patch. (From OE-Core rev: d8a60b324c340bf88e2e8650f4771030490709c5) Signed-off-by: Victor Kamensky <kamensky@cisco.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@intel.com>
|
|
Date: Tue, 4 Oct 2016 16:37:53 +0100
|
|
Subject: [PATCH 4/6] systemtap: rationalise dependencies
|
|
|
|
Add an option to explicitly disable the monitor (and therefore the dependency on
|
|
json-c and ncurses).
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
|
|
---
|
|
configure.ac | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
Index: git/configure.ac
|
|
===================================================================
|
|
--- git.orig/configure.ac
|
|
+++ git/configure.ac
|
|
@@ -766,13 +766,16 @@ dnl We want either (or both) python prob
|
|
AM_CONDITIONAL([HAVE_PYTHON_PROBES],
|
|
[test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"])
|
|
|
|
+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor]))
|
|
+if test "$enable_monitor" != "no"; then
|
|
dnl Check for presence of json-c and ncurses for use in monitor mode
|
|
PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
|
|
PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
|
|
-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
|
|
if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
|
|
AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
|
|
fi
|
|
+fi
|
|
+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
|
|
|
|
AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
|
|
old_CFLAGS="$CFLAGS"
|