linux-kernel - [BUG/RFC 3/3] perf tools: Add missing GTK2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1380292332-6518-3-git-send-email-jolsa@redhat.com>
Date:	Fri, 27 Sep 2013 16:32:12 +0200
From:	Jiri Olsa <jolsa@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	Jiri Olsa <jolsa@...hat.com>,
	Corey Ashford <cjashfor@...ux.vnet.ibm.com>,
	Ingo Molnar <mingo@...e.hu>,
	Namhyung Kim <namhyung@...nel.org>,
	Paul Mackerras <paulus@...ba.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Arnaldo Carvalho de Melo <acme@...hat.com>,
	David Ahern <dsahern@...il.com>
Subject: [BUG/RFC 3/3] perf tools: Add missing GTK2_SUPPORT ifdefs

When building minimal perf via:
  NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1
  NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1
  NO_LIBBIONIC=1

We dont link -ldl and that's causing error for gtk2 related code,
which is disabled on command line (NO_GTK2), but not in the code
(GTK2_SUPPORT).

We probably need some global fix/change for this browser
enabled/disable code.

Tested just by building it corretly.

Signed-off-by: Jiri Olsa <jolsa@...hat.com>
Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: David Ahern <dsahern@...il.com>
---
 tools/perf/builtin-annotate.c | 6 ++++++
 tools/perf/builtin-report.c   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 577c3a1..ddde407 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -142,6 +142,7 @@ find_next:
 		}
 
 		if (use_browser == 2) {
+#ifdef GTK2_SUPPORT
 			int ret;
 			int (*annotate)(struct hist_entry *he,
 					struct perf_evsel *evsel,
@@ -161,6 +162,9 @@ find_next:
 			/* skip missing symbols */
 			nd = rb_next(nd);
 		} else if (use_browser == 1) {
+#else
+			use_browser = 1;
+#endif
 			key = hist_entry__tui_annotate(he, evsel, NULL);
 			switch (key) {
 			case -1:
@@ -258,6 +262,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 		goto out_delete;
 	}
 
+#ifdef GTK2_SUPPORT
 	if (use_browser == 2) {
 		void (*show_annotations)(void);
 
@@ -269,6 +274,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 		}
 		show_annotations();
 	}
+#endif
 
 out_delete:
 	/*
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 295025e..c902229 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -591,6 +591,7 @@ static int __cmd_report(struct perf_report *rep)
 				ret = 0;
 
 		} else if (use_browser == 2) {
+#ifdef GTK2_SUPPORT
 			int (*hist_browser)(struct perf_evlist *,
 					    const char *,
 					    struct hist_browser_timer *,
@@ -604,6 +605,7 @@ static int __cmd_report(struct perf_report *rep)
 			}
 			hist_browser(session->evlist, help, NULL,
 				     rep->min_percent);
+#endif
 		}
 	} else
 		perf_evlist__tty_browse_hists(session->evlist, rep, help);
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/