[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f755397211745e26a4cc693a195982de6c454edd@git.kernel.org>
Date: Sun, 15 Apr 2012 01:35:39 -0700
From: tip-bot for Stephane Eranian <eranian@...gle.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, eranian@...gle.com,
hpa@...or.com, mingo@...nel.org, peterz@...radead.org,
penberg@...nel.org, dsahern@...il.com, tglx@...utronix.de,
mingo@...e.hu
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@...gle.com>
AuthorDate: Tue, 10 Apr 2012 12:35:13 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.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@...gle.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Pekka Enberg <penberg@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20120410103513.GA9229@quad
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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)
--
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/
Powered by blists - more mailing lists