[PATCH] meson: make it possible to build etnaviv's cmdline compiler

[Christian Gmeiner]

Hi Dylan

Am Fr., 14. Dez. 2018 um 20:13 Uhr schrieb Dylan Baker <dylan at pnwbakers.com>:
>
> Quoting Christian Gmeiner (2018-12-13 12:07:23)
> > Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
> > ---
> >  meson.build                             | 2 +-
> >  meson_options.txt                       | 2 +-
> >  src/gallium/drivers/etnaviv/meson.build | 3 ++-
> >  3 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index fe647f682c..f516780115 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -57,7 +57,7 @@ with_osmesa = get_option('osmesa')
> >  with_swr_arches = get_option('swr-arches')
> >  with_tools = get_option('tools')
> >  if with_tools.contains('all')
> > -  with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
> > +  with_tools = ['etnaviv', 'freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
> >  endif
> >
> >  dri_drivers_path = get_option('dri-drivers-path')
> > diff --git a/meson_options.txt b/meson_options.txt
> > index a1d5ab0e18..005356b14c 100644
> > --- a/meson_options.txt
> > +++ b/meson_options.txt
> > @@ -301,7 +301,7 @@ option(
> >    'tools',
> >    type : 'array',
> >    value : [],
> > -  choices : ['freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
> > +  choices : ['etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
> >    description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
> >  )
> >  option(
> > diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
> > index 1733024ac9..63553dec51 100644
> > --- a/src/gallium/drivers/etnaviv/meson.build
> > +++ b/src/gallium/drivers/etnaviv/meson.build
> > @@ -101,7 +101,8 @@ etnaviv_compiler = executable(
> >    include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux],
> >    link_with : [libmesa_util, libgallium, libetnaviv],
> >    dependencies : [dep_libdrm_etnaviv],
> > -  build_by_default : false,
> > +  build_by_default : with_tools.contains('etnaviv'),
> > +  install : with_tools.contains('etnaviv'),
> >  )
> >
> >  driver_etnaviv = declare_dependency(
> > --
> > 2.19.2
> >
>
> You technically can build it already, `ninja
> src/gallium/drivers/etnaviv/etnaviv_compiler` should do the trick. This patch is
> obviously simpler and easier to use, and is in line with how other tools in mesa
> work, but can we change the commit message to something like:
>
> meson: add etnaviv to the tools option
>
> Or something similar.
>

Sounds fine to me. Btw thanks for the meson trick - I was not aware of it.

> with that:
> Reviewed-by: Dylan Baker <dylan at pnwbakers.com>


-- 
greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info