[Mesa-dev] [PATCH] meson: Check for actual LLVM required versions

[Dylan Baker]

Quoting Bas Nieuwenhuizen (2018-02-02 11:54:58)
> Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> 
> On Fri, Feb 2, 2018 at 7:55 PM, Dylan Baker <dylan at pnwbakers.com> wrote:
> > Currently we always check for 3.9.0, which is pretty safe since
> > everything except radv work with >= 3.9 and 3.9 is pretty old at this
> > point. However, radv actually requires 4.0, and there is a patch for
> > radeonsi to do the same.
> >
> > Fixes: 673dda833076 ("meson: build "radv" vulkan driver for radeon hardware")
> > Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> > ---
> >  meson.build | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 80ea60ffa7d..0a030b92d0a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -988,15 +988,23 @@ if with_gallium_opencl
> >    # TODO: optional modules
> >  endif
> >
> > +if with_amd_vk
> > +  _llvm_version = '>= 4.0.0'
> > +elif with_gallium_opencl or with_gallium_swr or with_gallium_r600 or with_gallium_radeonsi
> > +  _llvm_version = '>= 3.9.0'
> > +else
> > +  _llvm_version = '>= 3.3.0'
> > +endif
> > +
> >  _llvm = get_option('llvm')
> >  if _llvm == 'auto'
> >    dep_llvm = dependency(
> > -    'llvm', version : '>= 3.9.0', modules : llvm_modules,
> > +    'llvm', version : _llvm_version, modules : llvm_modules,
> >      required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl,
> >    )
> >    with_llvm = dep_llvm.found()
> >  elif _llvm == 'true'
> > -  dep_llvm = dependency('llvm', version : '>= 3.9.0', modules : llvm_modules)
> > +  dep_llvm = dependency('llvm', version : _llvm_version, modules : llvm_modules)
> >    with_llvm = true
> >  else
> >    dep_llvm = []
> > --
> > 2.16.0
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Thanks! I went ahead and pushed this, that way Marek can merge is radeonsi patch
(which should now be much more trivial for meson).

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180202/2b02bc7f/attachment.sig>