Re: [PATCH] trace-cmd: Fix build with gcc-10

[Steven Rostedt <rostedt@goodmis.org>]

On Sat, 9 May 2020 20:11:09 +0100
Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:

> On Sat, May 9, 2020 at 7:48 PM Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > On Sat, 9 May 2020 19:30:38 +0100
> > Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:  
> > >  
> > > > Thanks for the reminder, I haven't forgotten about it, just had other
> > > > things added on top of my "todo" list.
> > > >
> > > > I'll go apply this now.  
> > >
> > > Thanks. And now kernelshark fails. :(
> > >  
> >
> > Have you tried doing a make clean and building again? Sometimes the
> > updates leave objects in place that need to be recompiled, but the
> > dependencies may miss them.  
> 
> The build will be done in a new chroot every time so there is no
> chance of objects from a previous build. Just to make sure I did 'git
> clone' in a new folder and tried to build again. And it’s the same
> failure. Also did 'make clean' and built again with the same failure.
> 
> 

Hmm, I wonder if something like this fixes it?

-- Steve

diff --git a/kernel-shark/src/KsUtils.hpp b/kernel-shark/src/KsUtils.hpp
index f44139bb..272a27d1 100644
--- a/kernel-shark/src/KsUtils.hpp
+++ b/kernel-shark/src/KsUtils.hpp
@@ -32,7 +32,7 @@
 
 //! @cond Doxygen_Suppress
 
-auto fontHeight = []()
+static auto fontHeight = []()
 {
 	QFont font;
 	QFontMetrics fm(font);
@@ -40,7 +40,7 @@ auto fontHeight = []()
 	return fm.height();
 };
 
-auto stringWidth = [](QString s)
+static auto stringWidth = [](QString s)
 {
 	QFont font;
 	QFontMetrics fm(font);