* [PATCH 1/2] perf/ui/gtk: Add missing zalloc object
@ 2020-01-13 10:43 Jiri Olsa
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jiri Olsa @ 2020-01-13 10:43 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan, Jelle van der Waa
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")
Link: https://lkml.kernel.org/n/tip-nuu3lyzzmi2t9zdvlg0i0bh0@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/ui/gtk/Build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
index ec22e899a224..9b5d5cbb7af7 100644
--- 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)
--
2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] perf/ui/gtk: Fix gtk2 build
2020-01-13 10:43 [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Jiri Olsa
@ 2020-01-13 10:43 ` Jiri Olsa
2020-01-14 15:41 ` Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-01-14 15:25 ` [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] perf ui gtk: " tip-bot2 for Jiri Olsa
2 siblings, 2 replies; 6+ messages in thread
From: Jiri Olsa @ 2020-01-13 10:43 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ravi Bangoria, lkml, Ingo Molnar, Namhyung Kim,
Alexander Shishkin, Peter Zijlstra, Michael Petlan,
Jelle van der Waa
Ravi Bangoria reported issue when detecting gtk2 on Fedora 31,
where some types got deprecated:
/usr/include/gtk-2.0/gtk/gtktypeutils.h:236:1: error: ‘GTypeDebugFlags’ is deprecated [-Werror=deprecated-declarations]
236 | void gtk_type_init (GTypeDebugFlags debug_flags);
Fixing this for perf by allowing the compile to pass
with deprecated symbols via -Wno-deprecated-declarations.
Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Link: https://lkml.kernel.org/n/tip-kg8fqsa0bgq3suc9ubonh4xu@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/build/feature/Makefile | 2 +-
tools/perf/ui/gtk/Build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index f30a89046aa3..7ac0d8088565 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -197,7 +197,7 @@ $(OUTPUT)test-libcrypto.bin:
$(BUILD) -lcrypto
$(OUTPUT)test-gtk2.bin:
- $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
+ $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
$(OUTPUT)test-gtk2-infobar.bin:
$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
index 9b5d5cbb7af7..eef708c502f4 100644
--- a/tools/perf/ui/gtk/Build
+++ b/tools/perf/ui/gtk/Build
@@ -1,4 +1,4 @@
-CFLAGS_gtk += -fPIC $(GTK_CFLAGS)
+CFLAGS_gtk += -fPIC $(GTK_CFLAGS) -Wno-deprecated-declarations
gtk-y += browser.o
gtk-y += hists.o
--
2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] perf/ui/gtk: Fix gtk2 build
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
@ 2020-01-14 15:41 ` Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-01-14 15:41 UTC (permalink / raw)
To: Jiri Olsa
Cc: Ravi Bangoria, lkml, Ingo Molnar, Namhyung Kim,
Alexander Shishkin, Peter Zijlstra, Michael Petlan,
Jelle van der Waa
Em Mon, Jan 13, 2020 at 11:43:58AM +0100, Jiri Olsa escreveu:
> Ravi Bangoria reported issue when detecting gtk2 on Fedora 31,
> where some types got deprecated:
>
> /usr/include/gtk-2.0/gtk/gtktypeutils.h:236:1: error: ‘GTypeDebugFlags’ is deprecated [-Werror=deprecated-declarations]
> 236 | void gtk_type_init (GTypeDebugFlags debug_flags);
>
> Fixing this for perf by allowing the compile to pass
> with deprecated symbols via -Wno-deprecated-declarations.
Thanks, applied.
- Arnaldo
> Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> Link: https://lkml.kernel.org/n/tip-kg8fqsa0bgq3suc9ubonh4xu@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/build/feature/Makefile | 2 +-
> tools/perf/ui/gtk/Build | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index f30a89046aa3..7ac0d8088565 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -197,7 +197,7 @@ $(OUTPUT)test-libcrypto.bin:
> $(BUILD) -lcrypto
>
> $(OUTPUT)test-gtk2.bin:
> - $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
> + $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
>
> $(OUTPUT)test-gtk2-infobar.bin:
> $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
> diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
> index 9b5d5cbb7af7..eef708c502f4 100644
> --- a/tools/perf/ui/gtk/Build
> +++ b/tools/perf/ui/gtk/Build
> @@ -1,4 +1,4 @@
> -CFLAGS_gtk += -fPIC $(GTK_CFLAGS)
> +CFLAGS_gtk += -fPIC $(GTK_CFLAGS) -Wno-deprecated-declarations
>
> gtk-y += browser.o
> gtk-y += hists.o
> --
> 2.24.1
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip: perf/core] perf/ui/gtk: Fix gtk2 build
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
2020-01-14 15:41 ` Arnaldo Carvalho de Melo
@ 2020-01-20 8:27 ` tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2020-01-20 8:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ravi Bangoria, Jiri Olsa, Alexander Shishkin, Jelle van der Waa,
Michael Petlan, Namhyung Kim, Peter Zijlstra,
Arnaldo Carvalho de Melo, x86, LKML
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 93e843f95f095aeb533ab67ac4718f848d38dfa0
Gitweb: https://git.kernel.org/tip/93e843f95f095aeb533ab67ac4718f848d38dfa0
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 13 Jan 2020 11:43:58 +01:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 14 Jan 2020 12:40:33 -03:00
perf/ui/gtk: Fix gtk2 build
Ravi Bangoria reported an issue when doing the gtk2 feature detection on
Fedora 31, where some types got deprecated:
/usr/include/gtk-2.0/gtk/gtktypeutils.h:236:1: error: ‘GTypeDebugFlags’ is deprecated [-Werror=deprecated-declarations]
236 | void gtk_type_init (GTypeDebugFlags debug_flags);
Fix this for perf by allowing the compile to pass with deprecated
symbols via the -Wno-deprecated-declarations compiler directive.
Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
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-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/feature/Makefile | 2 +-
tools/perf/ui/gtk/Build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index f30a890..7ac0d80 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -197,7 +197,7 @@ $(OUTPUT)test-libcrypto.bin:
$(BUILD) -lcrypto
$(OUTPUT)test-gtk2.bin:
- $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
+ $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
$(OUTPUT)test-gtk2-infobar.bin:
$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
index 9b5d5cb..eef708c 100644
--- a/tools/perf/ui/gtk/Build
+++ b/tools/perf/ui/gtk/Build
@@ -1,4 +1,4 @@
-CFLAGS_gtk += -fPIC $(GTK_CFLAGS)
+CFLAGS_gtk += -fPIC $(GTK_CFLAGS) -Wno-deprecated-declarations
gtk-y += browser.o
gtk-y += hists.o
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] perf/ui/gtk: Add missing zalloc object
2020-01-13 10:43 [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Jiri Olsa
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
@ 2020-01-14 15:25 ` Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] perf ui gtk: " tip-bot2 for Jiri Olsa
2 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-01-14 15:25 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan, Jelle van der Waa
Em Mon, Jan 13, 2020 at 11:43:57AM +0100, Jiri Olsa escreveu:
> 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.
Thanks, applied.
- Arnaldo
> Fixes: 7f7c536f23e6 ("tools lib: Adopt zalloc()/zfree() from tools/perf")
> Link: https://lkml.kernel.org/n/tip-nuu3lyzzmi2t9zdvlg0i0bh0@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/ui/gtk/Build | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
> index ec22e899a224..9b5d5cbb7af7 100644
> --- 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)
> --
> 2.24.1
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread* [tip: perf/core] perf ui gtk: Add missing zalloc object
2020-01-13 10:43 [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Jiri Olsa
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
2020-01-14 15:25 ` [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Arnaldo Carvalho de Melo
@ 2020-01-20 8:27 ` tip-bot2 for Jiri Olsa
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2020-01-20 8:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Olsa, Alexander Shishkin, Jelle van der Waa, Michael Petlan,
Namhyung Kim, Peter Zijlstra, Arnaldo Carvalho de Melo, x86,
LKML
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 604e2139a1026793b8c2172bd92c7e9d039a5cf0
Gitweb: https://git.kernel.org/tip/604e2139a1026793b8c2172bd92c7e9d039a5cf0
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 13 Jan 2020 11:43:57 +01:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 14 Jan 2020 12:24:16 -03:00
perf ui gtk: Add missing zalloc object
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>
---
tools/perf/ui/gtk/Build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
index ec22e89..9b5d5cb 100644
--- 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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-20 8:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-13 10:43 [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Jiri Olsa
2020-01-13 10:43 ` [PATCH 2/2] perf/ui/gtk: Fix gtk2 build Jiri Olsa
2020-01-14 15:41 ` Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-01-14 15:25 ` [PATCH 1/2] perf/ui/gtk: Add missing zalloc object Arnaldo Carvalho de Melo
2020-01-20 8:27 ` [tip: perf/core] perf ui gtk: " tip-bot2 for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).