On Friday, 2018-01-05 15:40:20 -0800, Dylan Baker wrote:
> Currently the meosn build has a mix of two styles:
> arg : [foo, ...
> bar],
>
> and
> arg :[
^
Missing space
Other than that, the series is:
Acked-by: Eric Engestrom <eric.engest...@imgtec.com>
> foo, ...,
> bar,
> ]
>
> For consistency let's pick one. I've picked the later style, which I
> think is more readable, and is more common in the mesa code base.
>
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> ---
> src/amd/addrlib/meson.build | 9 ++-
> src/amd/common/meson.build | 10 +--
> src/amd/vulkan/meson.build | 32 +++++----
> src/broadcom/meson.build | 5 +-
> src/compiler/glsl/glcpp/meson.build | 6 +-
> src/compiler/glsl/meson.build | 6 +-
> src/gallium/drivers/freedreno/meson.build | 6 +-
> src/glx/meson.build | 5 +-
> src/intel/compiler/meson.build | 6 +-
> src/intel/vulkan/meson.build | 82 +++++++++++++++---------
> src/mapi/es1api/meson.build | 6 +-
> src/mapi/es2api/meson.build | 6 +-
> src/mapi/shared-glapi/meson.build | 6 +-
> src/mesa/drivers/dri/i965/meson.build | 23 ++++---
> src/mesa/drivers/dri/meson.build | 11 +--
> src/meson.build | 8 +-
> src/vulkan/util/meson.build | 6 +-
> 17 files changed, 148 insertions(+), 85 deletions(-)
>
> diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
> index ed0dde6..1d16ba8 100644
> --- a/src/amd/addrlib/meson.build
> +++ b/src/amd/addrlib/meson.build
> @@ -53,8 +53,11 @@ files_addrlib = files(
> libamdgpu_addrlib = static_library(
> 'addrlib',
> files_addrlib,
> - include_directories : include_directories(
> - 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
> - '../common', '../../'),
> + include_directories : [
> + include_directories(
> + 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
> + '../common', '../../',
> + ),
> + ],
> cpp_args : cpp_vis_args,
> )
> diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
> index 63c1517..43a633a 100644
> --- a/src/amd/common/meson.build
> +++ b/src/amd/common/meson.build
> @@ -53,10 +53,12 @@ amd_common_files = files(
> libamd_common = static_library(
> 'amd_common',
> [amd_common_files, sid_tables_h, nir_opcodes_h],
> - include_directories : [inc_common, inc_compiler, inc_nir, inc_mesa,
> inc_mapi,
> - inc_amd],
> - dependencies : [dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu,
> - dep_valgrind],
> + include_directories : [
> + inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi, inc_amd,
> + ],
> + dependencies : [
> + dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
> + ],
> c_args : [c_vis_args],
> cpp_args : [cpp_vis_args],
> )
> diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
> index 9399735..054ee5e 100644
> --- a/src/amd/vulkan/meson.build
> +++ b/src/amd/vulkan/meson.build
> @@ -22,8 +22,10 @@ radv_entrypoints = custom_target(
> 'radv_entrypoints.[ch]',
> input : ['radv_entrypoints_gen.py', vk_api_xml],
> output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
> - command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--outdir', meson.current_build_dir()],
> + command : [
> + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
> + meson.current_build_dir()
> + ],
> depend_files : files('radv_extensions.py'),
> )
>
> @@ -31,8 +33,9 @@ radv_extensions_c = custom_target(
> 'radv_extensions.c',
> input : ['radv_extensions.py', vk_api_xml],
> output : ['radv_extensions.c'],
> - command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--out', '@OUTPUT@'],
> + command : [
> + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out', '@OUTPUT@',
> + ],
> )
>
> vk_format_table_c = custom_target(
> @@ -111,13 +114,20 @@ endif
>
> libvulkan_radeon = shared_library(
> 'vulkan_radeon',
> - [libradv_files, radv_entrypoints, radv_extensions_c, nir_opcodes_h,
> vk_format_table_c],
> - include_directories : [inc_common, inc_amd, inc_amd_common, inc_compiler,
> - inc_vulkan_util, inc_vulkan_wsi],
> - link_with : [libamd_common, libamdgpu_addrlib, libvulkan_util,
> - libvulkan_wsi, libnir, libmesa_util],
> - dependencies : [dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl,
> - dep_m, dep_valgrind],
> + [libradv_files, radv_entrypoints, radv_extensions_c, nir_opcodes_h,
> + vk_format_table_c],
> + include_directories : [
> + inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util,
> + inc_vulkan_wsi,
> + ],
> + link_with : [
> + libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi, libnir,
> + libmesa_util,
> + ],
> + dependencies : [
> + dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
> + dep_valgrind,
> + ],
> c_args : [c_vis_args, no_override_init_args, radv_flags],
> link_args : [ld_args_bsymbolic, ld_args_gc_sections],
> install : true,
> diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
> index 6072fd1..f2a5e53 100644
> --- a/src/broadcom/meson.build
> +++ b/src/broadcom/meson.build
> @@ -29,10 +29,7 @@ if with_gallium_vc5
> libbroadcom_vc5 = static_library(
> 'libbroadcom_vc5',
> [
> - files(
> - 'common/v3d_debug.c',
> - 'clif/clif_dump.c',
> - ),
> + files('common/v3d_debug.c', 'clif/clif_dump.c'),
> v3d_xml_pack,
> ],
> include_directories : [inc_common, inc_broadcom, inc_src],
> diff --git a/src/compiler/glsl/glcpp/meson.build
> b/src/compiler/glsl/glcpp/meson.build
> index 17ee1a2..03b43b9 100644
> --- a/src/compiler/glsl/glcpp/meson.build
> +++ b/src/compiler/glsl/glcpp/meson.build
> @@ -22,8 +22,10 @@ glcpp_parse = custom_target(
> 'glcpp-parse.[ch]',
> input : 'glcpp-parse.y',
> output : ['glcpp-parse.c', 'glcpp-parse.h'],
> - command : [prog_bison, '-o', '@OUTPUT0@', '-p', 'glcpp_parser_',
> - '--defines=@OUTPUT1@', '@INPUT@'],
> + command : [
> + prog_bison, '-o', '@OUTPUT0@', '-p', 'glcpp_parser_',
> + '--defines=@OUTPUT1@', '@INPUT@',
> + ],
> )
>
> glcpp_lex = custom_target(
> diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
> index 6aaa9ba..2a6bddf 100644
> --- a/src/compiler/glsl/meson.build
> +++ b/src/compiler/glsl/meson.build
> @@ -24,8 +24,10 @@ glsl_parser = custom_target(
> 'glsl_parser',
> input : 'glsl_parser.yy',
> output : ['glsl_parser.cpp', 'glsl_parser.h'],
> - command : [prog_bison, '-o', '@OUTPUT0@', '-p', '_mesa_glsl_',
> - '--defines=@OUTPUT1@', '@INPUT@'],
> + command : [
> + prog_bison, '-o', '@OUTPUT0@', '-p', '_mesa_glsl_',
> '--defines=@OUTPUT1@',
> + '@INPUT@',
> + ],
> )
>
> glsl_lexer_cpp = custom_target(
> diff --git a/src/gallium/drivers/freedreno/meson.build
> b/src/gallium/drivers/freedreno/meson.build
> index bc64d30..af288ce 100644
> --- a/src/gallium/drivers/freedreno/meson.build
> +++ b/src/gallium/drivers/freedreno/meson.build
> @@ -22,8 +22,10 @@ ir3_nir_trig_c = custom_target(
> 'ir3_nir_trig.c',
> input : 'ir3/ir3_nir_trig.py',
> output : 'ir3_nir_trig.c',
> - command : [prog_python2, '@INPUT@', '-p',
> - join_paths(meson.source_root(), 'src/compiler/nir/')],
> + command : [
> + prog_python2, '@INPUT@',
> + '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
> + ],
> capture : true,
> depend_files : nir_algebraic_py,
> )
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index cdb388e..7757eee 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -146,7 +146,10 @@ libglx = static_library(
> c_vis_args, gl_lib_cargs,
> '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name,
> gl_lib_version.split('.')[0]),
> ],
> - link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> extra_libs_libglx],
> + link_with : [
> + libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> + extra_libs_libglx,
> + ],
> dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11,
> dep_glvnd],
> build_by_default : false,
> )
> diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
> index 91127bf..c54c117 100644
> --- a/src/intel/compiler/meson.build
> +++ b/src/intel/compiler/meson.build
> @@ -121,8 +121,10 @@ brw_nir_trig = custom_target(
> 'brw_nir_trig_workarounds.c',
> input : 'brw_nir_trig_workarounds.py',
> output : 'brw_nir_trig_workarounds.c',
> - command : [prog_python2, '@INPUT@', '-p',
> - join_paths(meson.source_root(), 'src/compiler/nir/')],
> + command : [
> + prog_python2, '@INPUT@',
> + '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
> + ],
> depend_files : nir_algebraic_py,
> capture : true,
> )
> diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
> index 606a489..b219201 100644
> --- a/src/intel/vulkan/meson.build
> +++ b/src/intel/vulkan/meson.build
> @@ -22,8 +22,10 @@ anv_entrypoints = custom_target(
> 'anv_entrypoints.[ch]',
> input : ['anv_entrypoints_gen.py', vk_api_xml,
> vk_android_native_buffer_xml],
> output : ['anv_entrypoints.h', 'anv_entrypoints.c'],
> - command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--xml', '@INPUT2@', '--outdir', meson.current_build_dir()],
> + command : [
> + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@',
> + '--outdir', meson.current_build_dir(),
> + ],
> depend_files : files('anv_extensions.py'),
> )
>
> @@ -31,17 +33,21 @@ anv_extensions_c = custom_target(
> 'anv_extensions.c',
> input : ['anv_extensions.py', vk_api_xml, vk_android_native_buffer_xml],
> output : 'anv_extensions.c',
> - command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--xml', '@INPUT2@', '--out', '@OUTPUT@'],
> + command : [
> + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@',
> + '--out', '@OUTPUT@',
> + ],
> )
>
> intel_icd = custom_target(
> 'intel_icd',
> input : 'anv_icd.py',
> output : 'intel_icd.@0@.json'.format(host_machine.cpu()),
> - command : [prog_python2, '@INPUT@',
> - '--lib-path', join_paths(get_option('prefix'),
> get_option('libdir')),
> - '--out', '@OUTPUT@'],
> + command : [
> + prog_python2, '@INPUT@',
> + '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
> + '--out', '@OUTPUT@',
> + ],
> depend_files : files('anv_extensions.py'),
> build_by_default : true,
> install_dir : with_vulkan_icd_dir,
> @@ -52,9 +58,10 @@ dev_icd = custom_target(
> 'dev_icd',
> input : 'anv_icd.py',
> output : 'dev_icd.@0@.json'.format(host_machine.cpu()),
> - command : [prog_python2, '@INPUT@',
> - '--lib-path', meson.current_build_dir(),
> - '--out', '@OUTPUT@'],
> + command : [
> + prog_python2, '@INPUT@', '--lib-path', meson.current_build_dir(),
> + '--out', '@OUTPUT@'
> + ],
> depend_files : files('anv_extensions.py'),
> build_by_default : true,
> install : false,
> @@ -85,11 +92,15 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75',
> ['gen7_cmd_buffer.c']],
> _files = g[1]
> _lib = static_library(
> 'libanv_gen@0@'.format(_gen),
> - [anv_gen_files, _files, block_entrypoints, nir_opcodes_h],
> - include_directories : [inc_common, inc_compiler, inc_drm_uapi, inc_intel,
> - inc_vulkan_util, inc_vulkan_wsi],
> - c_args : [c_vis_args, no_override_init_args, '-msse2',
> - '-DGEN_VERSIONx10=@0@'.format(_gen)],
> + [anv_gen_files, _files, block_entrypoints],
> + include_directories : [
> + inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
> + inc_vulkan_wsi,
> + ],
> + c_args : [
> + c_vis_args, no_override_init_args, '-msse2',
> + '-DGEN_VERSIONx10=@0@'.format(_gen),
> + ],
> dependencies : [dep_libdrm, dep_valgrind],
> )
> libanv_gen_libs += _lib
> @@ -145,8 +156,10 @@ endif
> libanv_common = static_library(
> 'anv_common',
> [libanv_files, anv_entrypoints, anv_extensions_c, nir_opcodes_h],
> - include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
> - inc_vulkan_util, inc_vulkan_wsi],
> + include_directories : [
> + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
> + inc_vulkan_wsi,
> + ],
> c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
> dependencies : [dep_valgrind, anv_deps, dep_libdrm],
> )
> @@ -154,11 +167,15 @@ libanv_common = static_library(
> libvulkan_intel = shared_library(
> 'vulkan_intel',
> [files('anv_gem.c'), block_entrypoints],
> - include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
> - inc_vulkan_util, inc_vulkan_wsi],
> + include_directories : [
> + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
> + inc_vulkan_wsi,
> + ],
> link_whole : [libanv_common, libanv_gen_libs],
> - link_with : [libintel_compiler, libintel_common, libisl, libblorp,
> - libvulkan_util, libvulkan_wsi, libnir, libmesa_util],
> + link_with : [
> + libintel_compiler, libintel_common, libisl, libblorp, libvulkan_util,
> + libvulkan_wsi, libnir, libmesa_util,
> + ],
> dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps,
> dep_valgrind],
> c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
> link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic,
> ld_args_gc_sections],
> @@ -169,14 +186,18 @@ if with_tests
> libvulkan_intel_test = static_library(
> 'vulkan_intel_test',
> [files('anv_gem_stubs.c'), block_entrypoints],
> - include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
> - inc_vulkan_util, inc_vulkan_wsi],
> + include_directories : [
> + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
> + inc_vulkan_wsi,
> + ],
> link_whole : libanv_common,
> - link_with : [libanv_gen_libs, libintel_compiler, libintel_common,
> - libisl, libblorp, libvulkan_util, libvulkan_wsi,
> - libnir, libmesa_util],
> - dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps,
> - dep_valgrind],
> + link_with : [
> + libanv_gen_libs, libintel_compiler, libintel_common, libisl, libblorp,
> + libvulkan_util, libvulkan_wsi, libnir, libmesa_util,
> + ],
> + dependencies : [
> + dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind,
> + ],
> c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
> )
>
> @@ -187,8 +208,9 @@ if with_tests
> ['tests/@0@.c'.format(t), dummy_cpp, block_entrypoints],
> link_with : libvulkan_intel_test,
> dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
> - include_directories : [inc_common, inc_intel, inc_compiler,
> - inc_vulkan_util, inc_vulkan_wsi],
> + include_directories : [
> + inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi,
> + ],
> )
> test('anv_@0@'.format(t), _exe)
> endforeach
> diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
> index 36adde4..53851da 100644
> --- a/src/mapi/es1api/meson.build
> +++ b/src/mapi/es1api/meson.build
> @@ -30,8 +30,10 @@ es1_glapi_mapi_tmp_h = custom_target(
> libglesv1_cm = shared_library(
> 'GLESv1_CM',
> ['../entry.c', es1_glapi_mapi_tmp_h],
> - c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
> -
> '-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path())],
> + c_args : [
> + c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
> + '-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path()),
> + ],
> link_args : [ld_args_gc_sections],
> include_directories : [inc_src, inc_include, inc_mapi],
> link_with : libglapi,
> diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
> index be5b8ab..8751107 100644
> --- a/src/mapi/es2api/meson.build
> +++ b/src/mapi/es2api/meson.build
> @@ -30,8 +30,10 @@ es2_glapi_mapi_tmp_h = custom_target(
> libgles2 = shared_library(
> 'GLESv2',
> ['../entry.c', es2_glapi_mapi_tmp_h],
> - c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
> -
> '-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path())],
> + c_args : [
> + c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
> + '-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path()),
> + ],
> link_args : [ld_args_gc_sections],
> include_directories : [inc_src, inc_include, inc_mapi],
> link_with : libglapi,
> diff --git a/src/mapi/shared-glapi/meson.build
> b/src/mapi/shared-glapi/meson.build
> index eca2bd2..fe0d458 100644
> --- a/src/mapi/shared-glapi/meson.build
> +++ b/src/mapi/shared-glapi/meson.build
> @@ -39,8 +39,10 @@ shared_glapi_mapi_tmp_h = custom_target(
> libglapi = shared_library(
> 'glapi',
> [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
> - c_args : [c_msvc_compat_args, '-DMAPI_MODE_GLAPI',
> -
> '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path())],
> + c_args : [
> + c_msvc_compat_args, '-DMAPI_MODE_GLAPI',
> + '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path()),
> + ],
> link_args : [ld_args_gc_sections],
> include_directories : [inc_src, inc_include, inc_mapi],
> dependencies : [dep_thread, dep_selinux],
> diff --git a/src/mesa/drivers/dri/i965/meson.build
> b/src/mesa/drivers/dri/i965/meson.build
> index 0a214a0..e3bf9cc 100644
> --- a/src/mesa/drivers/dri/i965/meson.build
> +++ b/src/mesa/drivers/dri/i965/meson.build
> @@ -140,8 +140,10 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80',
> '90', '100']
> 'libi965_gen@0@'.format(v),
> ['genX_blorp_exec.c', 'genX_state_upload.c', nir_opcodes_h,
> gen_xml_pack],
> include_directories : [inc_common, inc_intel, inc_dri_common],
> - c_args : [c_vis_args, no_override_init_args, '-msse2',
> - '-DGEN_VERSIONx10=@0@'.format(v)],
> + c_args : [
> + c_vis_args, no_override_init_args, '-msse2',
> + '-DGEN_VERSIONx10=@0@'.format(v),
> + ],
> dependencies : [dep_libdrm],
> )
> i965_gen_libs += _lib
> @@ -149,9 +151,10 @@ endforeach
>
> oa_generator = generator(
> prog_python2,
> - arguments : ['@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@',
> - '--chipset', '@EXTRA_ARGS@', '--code', '@OUTPUT0@',
> - '--header', '@OUTPUT1@'],
> + arguments : [
> + '@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@', '--chipset', '@EXTRA_ARGS@',
> + '--code', '@OUTPUT0@', '--header', '@OUTPUT1@',
> + ],
> output : ['@BASENAME@.c', '@BASENAME@.h'],
> )
>
> @@ -166,12 +169,14 @@ libi965 = static_library(
> 'i965',
> [files_i965, i965_oa_sources, nir_opcodes_h, ir_expression_operation_h,
> xmlpool_options_h],
> - include_directories : [inc_common, inc_intel, inc_dri_common, inc_util,
> - inc_drm_uapi, inc_nir],
> + include_directories : [
> + inc_common, inc_intel, inc_dri_common, inc_util, inc_drm_uapi, inc_nir,
> + ],
> c_args : [c_vis_args, no_override_init_args, '-msse2'],
> cpp_args : [cpp_vis_args, '-msse2'],
> - link_with : [i965_gen_libs, libintel_common, libisl, libintel_compiler,
> - libblorp],
> + link_with : [
> + i965_gen_libs, libintel_common, libisl, libintel_compiler, libblorp,
> + ],
> dependencies : [dep_libdrm, dep_valgrind],
> )
>
> diff --git a/src/mesa/drivers/dri/meson.build
> b/src/mesa/drivers/dri/meson.build
> index 4ec2f34..e73ee39 100644
> --- a/src/mesa/drivers/dri/meson.build
> +++ b/src/mesa/drivers/dri/meson.build
> @@ -46,10 +46,13 @@ if dri_drivers != []
> 'mesa_dri_drivers',
> dummy_cpp, # see meson #2180
> link_whole : dri_drivers,
> - link_with : [libmegadriver_stub, libdricommon, libxmlconfig, libglapi,
> - libmesa_util, libnir, libmesa_classic],
> - dependencies : [dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread,
> - dep_dl],
> + link_with : [
> + libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util,
> + libnir, libmesa_classic,
> + ],
> + dependencies : [
> + dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread, dep_dl,
> + ],
> link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic,
> ld_args_gc_sections],
> )
>
> diff --git a/src/meson.build b/src/meson.build
> index 043a81b..5fc14ac 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -29,9 +29,11 @@ inc_amd_common = include_directories('amd/common')
>
> libglsl_util = static_library(
> 'glsl_util',
> - files('mesa/main/extensions_table.c', 'mesa/main/imports.c',
> - 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
> - 'mesa/program/dummy_errors.c'),
> + files(
> + 'mesa/main/extensions_table.c', 'mesa/main/imports.c',
> + 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
> + 'mesa/program/dummy_errors.c',
> + ),
> include_directories : [inc_common],
> c_args : [c_vis_args],
> build_by_default : false,
> diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
> index 6b0ec1e..a6208b0 100644
> --- a/src/vulkan/util/meson.build
> +++ b/src/vulkan/util/meson.build
> @@ -28,8 +28,10 @@ vk_enum_to_str = custom_target(
> 'vk_enum_to_str',
> input : ['gen_enum_to_str.py', vk_api_xml[0]],
> output : ['vk_enum_to_str.c', 'vk_enum_to_str.h'],
> - command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--outdir', meson.current_build_dir()],
> + command : [
> + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
> + meson.current_build_dir()
> + ],
> )
>
> libvulkan_util = static_library(
> --
> git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
