[Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown

[Dylan Baker]

Quoting Guido Günther (2018-08-27 09:32:54)
> Hi,
> On Mon, Aug 27, 2018 at 09:23:44AM -0700, Dylan Baker wrote:
> > Quoting Guido Günther (2018-08-26 13:23:59)
> > > V2: Add one missing @0@
> > > 
> > > Signed-off-by: Guido Günther <guido.gunther at puri.sm>
> > > ---
> > >  meson.build | 21 ++++++++++++++-------
> > >  1 file changed, 14 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/meson.build b/meson.build
> > > index 1b3dfa221c9..c3a7e8cdd74 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -102,13 +102,15 @@ if _drivers.contains('auto')
> > >      elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
> > >        _drivers = []
> > >      else
> > > -      error('Unknown architecture. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +      error('Unknown architecture @0 at . Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +            host_machine.cpu_family()))
> > >      endif
> > >    elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
> > >      # only swrast would make sense here, but gallium swrast is a much better default
> > >      _drivers = []
> > >    else
> > > -    error('Unknown OS. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +    error('Unknown OS @0 at . Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +          host_machine.system()))
> > >    endif
> > >  endif
> > >  
> > > @@ -135,12 +137,14 @@ if _drivers.contains('auto')
> > >          'tegra', 'virgl', 'swrast',
> > >        ]
> > >      else
> > > -      error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +      error('Unknown architecture @0 at . Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +            host_machine.cpu_family()))
> > >      endif
> > >    elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
> > >      _drivers = ['swrast']
> > >    else
> > > -    error('Unknown OS. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +    error('Unknown OS @0 at . Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +          host_machine.system()))
> > >    endif
> > >  endif
> > >  with_gallium_pl111 = _drivers.contains('pl111')
> > > @@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
> > >      if host_machine.cpu_family().startswith('x86')
> > >        _vulkan_drivers = ['amd', 'intel']
> > >      else
> > > -      error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +      error('Unknown architecture @0 at . Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +            host_machine.cpu_family()))
> > >      endif
> > >    elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
> > >      # No vulkan driver supports windows or macOS currently
> > >      _vulkan_drivers = []
> > >    else
> > > -    error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
> > > +    error('Unknown OS @0 at . Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format(
> > > +          host_machine.system()))
> > >    endif
> > >  endif
> > >  
> > > @@ -230,7 +236,8 @@ if _platforms.contains('auto')
> > >    elif ['haiku'].contains(host_machine.system())
> > >      _platforms = ['haiku']
> > >    else
> > > -    error('Unknown OS. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.')
> > > +    error('Unknown OS @0 at . Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format(
> > > +          host_machine.system()))
> > >    endif
> > >  endif
> > >  
> > > -- 
> > > 2.18.0
> > > 
> > 
> > for the series,
> > Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
> 
> Thanks!
> 
> > 
> > Do you need me to push these for you?
> 
> Yes, please.
>  -- Guido
> 

Pushed. Thanks for this!
-------------- 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/20180827/d167cb7c/attachment.sig>