Quoting Eric Engestrom (2018-09-06 07:47:49) > The current minimum meson version supported is 0.44.1, so we have met > both the 0.43 and 0.44 requirement to not need these hacks anymore :) > > Signed-off-by: Eric Engestrom <[email protected]> > --- > meson.build | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/meson.build b/meson.build > index ae30efbfa4fdcd7c7492..9c0ae3469d4f9d0bb076 100644 > --- a/meson.build > +++ b/meson.build > @@ -1204,10 +1204,6 @@ else > endif > if with_llvm > _llvm_version = dep_llvm.version().split('.') > - # Development versions of LLVM have an 'svn' or 'git' suffix, we don't want > - # 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. > > # 3 digits versions in LLVM only started from 3.4.1 on > if dep_llvm.version().version_compare('>= 3.4.1') > @@ -1216,11 +1212,6 @@ if with_llvm > _llvm_patch = '0' > endif > > - if _llvm_patch.endswith('svn') > - _llvm_patch = _llvm_patch.split('s')[0] > - elif _llvm_patch.contains('git') > - _llvm_patch = _llvm_patch.split('g')[0] > - endif > pre_args += [ > '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), > '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), > -- > Cheers, > Eric >
Reviewed-by: Dylan Baker <[email protected]>
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
