[PATCH] perf tools: fix NO_GTK2 Makefile config error

[PATCH] perf tools: fix NO_GTK2 Makefile config error

[Stephane Eranian]

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>
---

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)

Re: [PATCH] perf tools: fix NO_GTK2 Makefile config error

[Namhyung Kim]

Hi, Stephane

On Tue, 10 Apr 2012 12:35:13 +0200, Stephane Eranian wrote:
> 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.
> 

I already sent a patch for this. Please see below:

  https://lkml.org/lkml/2012/4/11/459

Thanks,
Namhyung

Re: [PATCH] perf tools: fix NO_GTK2 Makefile config error

[Stephane Eranian]

On Thu, Apr 12, 2012 at 7:19 AM, Namhyung Kim <namhyung.kim@lge.com> wrote:
> Hi, Stephane
>
> On Tue, 10 Apr 2012 12:35:13 +0200, Stephane Eranian wrote:
>> 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.
>>
>
> I already sent a patch for this. Please see below:
>
>  https://lkml.org/lkml/2012/4/11/459
>
Ok, I was not copied onto your post. And then the fix is buried with others
unrelated changes, it seems. But fine with me. It just needs to be committed
now.


> Thanks,
> Namhyung

Re: [PATCH] perf tools: fix NO_GTK2 Makefile config error

[Arnaldo Carvalho de Melo]

Em Thu, Apr 12, 2012 at 10:55:48AM +0200, Stephane Eranian escreveu:
> On Thu, Apr 12, 2012 at 7:19 AM, Namhyung Kim <namhyung.kim@lge.com> wrote:
> > Hi, Stephane
> >
> > On Tue, 10 Apr 2012 12:35:13 +0200, Stephane Eranian wrote:
> >> 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.
> >>
> >
> > I already sent a patch for this. Please see below:
> >
> >  https://lkml.org/lkml/2012/4/11/459
> >
> Ok, I was not copied onto your post. And then the fix is buried with others
> unrelated changes, it seems. But fine with me. It just needs to be committed
> now.

Yeah, would be better to have it as a separate patch, just the fix :-\

I think I'll pick Stephane's fix, stash it in perf/urgent, as your cset
that included the build fix is only in perf/core.

Repo at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

- Arnaldo

[tip:perf/urgent] perf tools: fix NO_GTK2 Makefile config error

[tip-bot for Stephane Eranian]

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)