Re: [Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-05 Thread Dylan Baker 
Please add a comment that svn suffixes are stripped by meson as of 0.43, and git
suffixes are strippped as of 0.44. With that,

Reviewed-by: Dylan Baker 

Quoting Greg V (2017-12-31 08:55:24)
> When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git
> exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
> becomes something like 5.0.0git-f8ab206b2176.
> 
> Don't blow up on these versions.
> ---
>  meson.build | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 23faad0a71..0e8e695965 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -994,9 +994,12 @@ if with_llvm
>_llvm_version = dep_llvm.version().split('.')
># Development versions of LLVM have an 'svn' suffix, we don't want that for
># our version checks.
> +  # Also LLVM can end up with a 'git-$revision' suffix if built inside a git 
> repo.
>_llvm_patch = _llvm_version[2]
>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@@1@@2@'.format(_llvm_version[0], _llvm_version[1], 
> _llvm_patch),
> -- 
> 2.15.1
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-05 Thread Dylan Baker 
Quoting Juan A. Suarez Romero (2018-01-05 04:42:05)
> On Fri, 2018-01-05 at 10:35 +0100, Gert Wollny wrote:
> > On Sun, 2017-12-31 at 19:55 +0300, Greg V wrote:
> > > > When LLVM is built inside of a git repo (even way below, e.g. 
> > > > /usr/ports/.git
> > > > exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
> > > > becomes something like 5.0.0git-f8ab206b2176.
> > > > 
> > > > Don't blow up on these versions.
> > > > 
> > 
> > This has actually been addressed by meson upstream:
> > 
> >   https://github.com/mesonbuild/meson/pull/2787
> > 
> 
> In this case, probably we want to remove also the "svn" strip in
> meson.build, as this is also covered by meson upstream.
> 
> J.A.

Only for versions 0.43 (for svn) and 0.44 (for git). Since we currently support
versions down to 0.42 I think we need to have this for now.

> 
> > Best,
> > Gert
> > 
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-05 Thread Juan A. Suarez Romero 
On Fri, 2018-01-05 at 10:35 +0100, Gert Wollny wrote:
> On Sun, 2017-12-31 at 19:55 +0300, Greg V wrote:
> > > When LLVM is built inside of a git repo (even way below, e.g. 
> > > /usr/ports/.git
> > > exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
> > > becomes something like 5.0.0git-f8ab206b2176.
> > > 
> > > Don't blow up on these versions.
> > > 
> 
> This has actually been addressed by meson upstream:
> 
>   https://github.com/mesonbuild/meson/pull/2787
> 

In this case, probably we want to remove also the "svn" strip in
meson.build, as this is also covered by meson upstream.

J.A.

> Best,
> Gert
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-05 Thread Gert Wollny 

On Sun, 2017-12-31 at 19:55 +0300, Greg V wrote:
>> When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git
>> exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
>> becomes something like 5.0.0git-f8ab206b2176.
>>
>> Don't blow up on these versions.
>>
This has actually been addressed by meson upstream:

  https://github.com/mesonbuild/meson/pull/2787

Best,
Gert

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-05 Thread Juan A. Suarez Romero 
Reviewed-by: Juan A. Suarez 

On Sun, 2017-12-31 at 19:55 +0300, Greg V wrote:
> When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git
> exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
> becomes something like 5.0.0git-f8ab206b2176.
> 
> Don't blow up on these versions.
> ---
>  meson.build | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 23faad0a71..0e8e695965 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -994,9 +994,12 @@ if with_llvm
>_llvm_version = dep_llvm.version().split('.')
># Development versions of LLVM have an 'svn' suffix, we don't want that for
># our version checks.
> +  # Also LLVM can end up with a 'git-$revision' suffix if built inside a git 
> repo.
>_llvm_patch = _llvm_version[2]
>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@@1@@2@'.format(_llvm_version[0], _llvm_version[1], 
> _llvm_patch),
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 10/14] meson: handle LLVM 'x.x.xgit-revision' versions

2018-01-03 Thread Greg V 
When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git
exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
becomes something like 5.0.0git-f8ab206b2176.

Don't blow up on these versions.
---
 meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meson.build b/meson.build
index 23faad0a71..0e8e695965 100644
--- a/meson.build
+++ b/meson.build
@@ -994,9 +994,12 @@ if with_llvm
   _llvm_version = dep_llvm.version().split('.')
   # Development versions of LLVM have an 'svn' suffix, we don't want that for
   # our version checks.
+  # Also LLVM can end up with a 'git-$revision' suffix if built inside a git 
repo.
   _llvm_patch = _llvm_version[2]
   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@@1@@2@'.format(_llvm_version[0], _llvm_version[1], 
_llvm_patch),
-- 
2.15.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev