Messages in this thread Patch in this message | | | Date | Sun, 15 Apr 2012 01:35:39 -0700 | From | tip-bot for Stephane Eranian <> | Subject | [tip:perf/urgent] perf tools: fix NO_GTK2 Makefile config error |
| |
Commit-ID: f755397211745e26a4cc693a195982de6c454edd Gitweb: http://git.kernel.org/tip/f755397211745e26a4cc693a195982de6c454edd Author: Stephane Eranian <eranian@google.com> AuthorDate: Tue, 10 Apr 2012 12:35:13 +0200 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 12 Apr 2012 15:48:15 -0300
perf tools: fix NO_GTK2 Makefile config error
In case the user specified NO_GTK2 on the make cmdline, compilation would fail with undefined symbol because the Makefile would not set the correct cpp variable: NO_GTK2 vs. NO_GTK2_SUPPORT.
This patch renames the variable to the correct name.
Signed-off-by: Stephane Eranian <eranian@google.com> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20120410103513.GA9229@quad Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 820371f..a20d0c5 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -527,7 +527,7 @@ else endif ifdef NO_GTK2 - BASIC_CFLAGS += -DNO_GTK2 + BASIC_CFLAGS += -DNO_GTK2_SUPPORT else FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0) ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)
| |