[Mesa-dev] [PATCH v2] meson: fix LLVM version detection when <= 3.4

[Dylan Baker]

Quoting Emil Velikov (2018-02-28 15:49:37)
> On 28 February 2018 at 21:15, Andres Gomez <agomez at igalia.com> wrote:
> > 3 digits versions in LLVM only started from 3.4.1 on. Hence, if you
> > have installed 3.4 or below, meson will fail even when we may not make
> > use of LLVM.
> >
> > v2: Properly compare LLVM version and set patch version to 0
> >     if < 3.4.1 (Eric).
> >
> > Cc: Dylan Baker <dylan at pnwbakers.com>
> > Cc: Eric Engestrom <eric.engestrom at imgtec.com>
> > Signed-off-by: Andres Gomez <agomez at igalia.com>
> > ---
> >  meson.build | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 308f64cf811..e9928a37931 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1037,7 +1037,14 @@ if with_llvm
> >    # that for our version checks.
> >    # svn suffixes are stripped by meson as of 0.43, and git suffixes are
> >    # strippped as of 0.44, but we support older meson versions.
> > -  _llvm_patch = _llvm_version[2]
> > +
> > +  # 3 digits versions in LLVM only started from 3.4.1 on
> > +  if dep_llvm.version().version_compare('>= 3.4.1')
> > +    _llvm_patch = _llvm_version[2]
> > +  else
> > +    _llvm_patch = '0'
> > +  endif
> > +
> >    if _llvm_patch.endswith('svn')
> >      _llvm_patch = _llvm_patch.split('s')[0]
> >    elif _llvm_patch.contains('git')
> 
> Thanks for fixing this up Andres.
> Can you please confirm that version_compare() works correctly if the
> version string ends with svn/git - say "3.5.1svn"
> 
> If that's a yes,
> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
> 
> -Emil

It does work correctly with 'svn' or 'git' appended, (at least when I tried it
it did).

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