[Mesa-dev] [PATCH mesa] meson: fix i965/anv/isl genX static lib names

[Eric Engestrom]

On Monday, 2018-06-18 13:30:49 -0700, Dylan Baker wrote:
> Quoting Eric Engestrom (2018-06-15 04:15:31)
> > Shouldn't make any functional difference, just that `liblibanv_gen90.a`
> > will now be called `libanv_gen90.a`.
> > 
> > Fixes: 3218056e0eb375eeda470 "meson: Build i965 and dri stack"
> > Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
> > Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> > ---
> >  src/intel/isl/meson.build             | 2 +-
> >  src/intel/vulkan/meson.build          | 2 +-
> >  src/mesa/drivers/dri/i965/meson.build | 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
> > index c70c5c05fcd1adb4c63b..5b57188d30c001172ab1 100644
> > --- a/src/intel/isl/meson.build
> > +++ b/src/intel/isl/meson.build
> > @@ -54,7 +54,7 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
> >               ['90', isl_gen9_files], ['100', []], ['110', []]]
> >    _gen = g[0]
> >    isl_gen_libs += static_library(
> > -    'libisl_gen at 0@'.format(_gen),
> > +    'isl_gen at 0@'.format(_gen),
> >      [g[1], isl_gen_files, gen_xml_pack],
> >      include_directories : [inc_common, inc_intel],
> >      c_args : [c_vis_args, no_override_init_args,
> > diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
> > index f20a8a54c9bbdfb43dd3..159ad092314bcef6ec7c 100644
> > --- a/src/intel/vulkan/meson.build
> > +++ b/src/intel/vulkan/meson.build
> > @@ -95,7 +95,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
> >               ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']]]
> >    _gen = g[0]
> >    libanv_gen_libs += static_library(
> > -    'libanv_gen at 0@'.format(_gen),
> > +    'anv_gen at 0@'.format(_gen),
> >      [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
> >      include_directories : [
> >        inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
> > diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
> > index 20404d5b059736b9bc8c..761bb51d6faa696798cc 100644
> > --- a/src/mesa/drivers/dri/i965/meson.build
> > +++ b/src/mesa/drivers/dri/i965/meson.build
> > @@ -138,7 +138,7 @@ files_i965 = files(
> >  i965_gen_libs = []
> >  foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
> >    i965_gen_libs += static_library(
> > -    'libi965_gen at 0@'.format(v),
> > +    'i965_gen at 0@'.format(v),
> >      ['genX_blorp_exec.c', 'genX_state_upload.c', gen_xml_pack],
> >      include_directories : [inc_common, inc_intel, inc_dri_common],
> >      c_args : [
> > -- 
> > Cheers,
> >   Eric
> > 
> 
> There was a trivial merge conflict on the 18.1 branch I resolved, you can look
> at it on my 18.1-proposed branch if you're interested.

Thanks for the heads up!
And yeah it looks all good to me :)