From 3c5e96914474fcb2b218cbefc43c213739252829 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 21 Dec 2022 09:31:30 -0800 Subject: [PATCH] meson: replace uses of ExternalProgram.path with .full_path The former is deprecated Reviewed-by: Jesse Natalie Acked-by: Alyssa Rosenzweig Part-of: --- meson.build | 4 ++-- src/amd/compiler/tests/meson.build | 4 ++-- src/gallium/targets/dri/meson.build | 2 +- src/gallium/targets/va/meson.build | 2 +- src/gallium/targets/vdpau/meson.build | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 911cc066c03..6bece9b6a53 100644 --- a/meson.build +++ b/meson.build @@ -2326,12 +2326,12 @@ if host_machine.system() == 'windows' prog_dumpbin = find_program('dumpbin', required : false) with_symbols_check = prog_dumpbin.found() and with_tests if with_symbols_check - symbols_check_args = ['--dumpbin', prog_dumpbin.path()] + symbols_check_args = ['--dumpbin', prog_dumpbin.full_path()] endif else prog_nm = find_program('nm') with_symbols_check = with_tests - symbols_check_args = ['--nm', prog_nm.path()] + symbols_check_args = ['--nm', prog_nm.full_path()] endif # This quirk needs to be applied to sources with functions defined in assembly diff --git a/src/amd/compiler/tests/meson.build b/src/amd/compiler/tests/meson.build index 5734700fea3..5764b8ac1bd 100644 --- a/src/amd/compiler/tests/meson.build +++ b/src/amd/compiler/tests/meson.build @@ -43,7 +43,7 @@ spirv_files = files( gen_spirv = generator(prog_python, output : '@BASENAME@-spirv.h', arguments : [join_paths(meson.current_source_dir(), 'glsl_scraper.py'), - '@INPUT@', '--with-glslang', prog_glslang.path(), '-o', '@OUTPUT@']) + '@INPUT@', '--with-glslang', prog_glslang.full_path(), '-o', '@OUTPUT@']) gen_spirv_files = gen_spirv.process(spirv_files) test( @@ -53,7 +53,7 @@ test( [aco_tests_files, gen_spirv_files], cpp_args : ['-DACO_TEST_SOURCE_DIR="@0@"'.format(meson.current_source_dir()), '-DACO_TEST_BUILD_ROOT="@0@"'.format(meson.build_root()), - '-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.path())] + + '-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.full_path())] + cpp_args_aco, include_directories : [ inc_include, inc_src, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm, diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index d0a9b91b5a2..b1c57d3cf04 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -140,7 +140,7 @@ if meson.version().version_compare('>= 0.58') endif meson.add_install_script( - install_megadrivers_py.path(), + install_megadrivers_py.full_path(), libgallium_dri.full_path(), dri_drivers_path, gallium_dri_drivers, diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index fc7814c3a8f..b4cfbfb70e8 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -107,7 +107,7 @@ else endforeach meson.add_install_script( - install_megadrivers_py.path(), + install_megadrivers_py.full_path(), libva_gallium.full_path(), va_drivers_path, va_drivers, diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 0fbbe95b454..b77dd6a6c7a 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -77,7 +77,7 @@ foreach d : [[with_gallium_r300, 'r300'], endforeach meson.add_install_script( - install_megadrivers_py.path(), + install_megadrivers_py.full_path(), libvdpau_gallium.full_path(), vdpau_drivers_path, vdpau_drivers,