Skip to contentSkip to conversation

perf tools: fix NO_GTK2 Makefile config error

PATCH In review Stephane Eranian 3 participants 5 messages Apr 10, 2012 – Apr 15, 2012 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

tools/perf/Makefile +1 -1
index 820371f..a20d0c5 100644
@@ -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)
#1 lore raw

Hi, Stephane

Quoted 7 lines · 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.

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

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

Thanks,
Namhyung

#2 lore raw
Quoted 8 lines · Namhyung Kim

Hi, Stephane

Quoted 5 lines · 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.

Quoted 7 lines
Quoted 2 lines

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.

Quoted 2 lines

Thanks,
Namhyung

#3 lore raw

Em Thu, Apr 12, 2012 at 10:55:48AM +0200, Stephane Eranian escreveu:

Quoted 12 lines · Namhyung Kim
Quoted 11 lines

Hi, Stephane

Quoted 7 lines · 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.

Quoted 7 lines
Quoted 4 lines

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

#4 lore raw
In reply to Stephane Eranian
Commit-ID:  f755397211745e26a4cc693a195982de6c454edd
Gitweb:     http://git.kernel.org/tip/f755397211745e26a4cc693a195982de6c454edd
Author:     Stephane Eranian <[email protected]>
AuthorDate: Tue, 10 Apr 2012 12:35:13 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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.

---
 tools/perf/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/Makefile +1 -1
index 820371f..a20d0c5 100644
@@ -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)