| From 604e2139a1026793b8c2172bd92c7e9d039a5cf0 Mon Sep 17 00:00:00 2001 |
| From: Jiri Olsa <jolsa@kernel.org> |
| Date: Mon, 13 Jan 2020 11:43:57 +0100 |
| Subject: perf ui gtk: Add missing zalloc object |
| |
| From: Jiri Olsa <jolsa@kernel.org> |
| |
| commit 604e2139a1026793b8c2172bd92c7e9d039a5cf0 upstream. |
| |
| When we moved zalloc.o to the library we missed gtk library which needs |
| it compiled in, otherwise the missing __zfree symbol will cause the |
| library to fail to load. |
| |
| Adding the zalloc object to the gtk library build. |
| |
| Fixes: 7f7c536f23e6 ("tools lib: Adopt zalloc()/zfree() from tools/perf") |
| Signed-off-by: Jiri Olsa <jolsa@kernel.org> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Jelle van der Waa <jelle@vdwaa.nl> |
| Cc: Michael Petlan <mpetlan@redhat.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Link: http://lore.kernel.org/lkml/20200113104358.123511-1-jolsa@kernel.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/ui/gtk/Build | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/tools/perf/ui/gtk/Build |
| +++ b/tools/perf/ui/gtk/Build |
| @@ -7,3 +7,8 @@ gtk-y += util.o |
| gtk-y += helpline.o |
| gtk-y += progress.o |
| gtk-y += annotate.o |
| +gtk-y += zalloc.o |
| + |
| +$(OUTPUT)ui/gtk/zalloc.o: ../lib/zalloc.c FORCE |
| + $(call rule_mkdir) |
| + $(call if_changed_dep,cc_o_c) |
