[Mesa-dev] [PATCH] meson: do not search for needless deps

Eric Engestrom eric.engestrom at imgtec.com
Thu Oct 26 08:49:44 UTC 2017


On Wednesday, 2017-10-25 13:00:49 -0700, Dylan Baker wrote:
> I don't really care one way or another. When I tested it the time spent was so
> insignificant I didn't care to optimize.
> 
> Acked-by: Dylan Baker <dylan at pnwbakers.com>
> 
> Quoting Erik Faye-Lund (2017-10-25 01:24:49)
> > If we don't want to use these deps, there's no good reason to search
> > for them in the first place. This should shave a bit of time for the
> > initial build.
> > ---
> > 
> > This would be a way of dealing with Gert's suggestion. Goes on top
> > of the previous patch.
> > 
> > Thoughts?
> > 
> >  meson.build | 20 ++++++++++++++------
> >  1 file changed, 14 insertions(+), 6 deletions(-)
> > 
> > diff --git a/meson.build b/meson.build
> > index e842bb1652..201956c4c8 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -666,9 +666,13 @@ if with_glvnd
> >  endif
> >  
> >  # TODO: make this conditional

Unless I'm misunderstanding this comment, I think you can drop it now
that you're adding `if with_valgrind` :)

I have no preference either: it's logically a tiny bit better, but also
makes the code a tiny bit more complicated, so I'm not sure what's best.
Either way, this is a small change that looks good to me, and it really
doesn't matter much, so:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

> > -dep_valgrind = dependency('valgrind', required : false)
> > -if dep_valgrind.found() and with_valgrind
> > -  pre_args += '-DHAVE_VALGRIND'
> > +if with_valgrind
> > +  dep_valgrind = dependency('valgrind', required : false)
> > +  if dep_valgrind.found()
> > +    pre_args += '-DHAVE_VALGRIND'
> > +  endif
> > +else
> > +  dep_valgrind = []
> >  endif
> >  
> >  # pthread stubs. Lets not and say we didn't
> > @@ -681,9 +685,13 @@ dep_selinux = []
> >  
> >  # TODO: llvm-prefix and llvm-shared-libs
> >  
> > -dep_unwind = dependency('libunwind', required : false)
> > -if dep_unwind.found() and with_libunwind
> > -  pre_args += '-DHAVE_LIBUNWIND'
> > +if with_libunwind
> > +  dep_unwind = dependency('libunwind', required : false)
> > +  if dep_unwind.found()
> > +    pre_args += '-DHAVE_LIBUNWIND'
> > +  endif
> > +else
> > +  dep_unwind = []
> >  endif
> >  
> >  # TODO: flags for opengl, gles, dri
> > -- 
> > 2.11.0
> > 


More information about the mesa-dev mailing list