From: Thomas Weißschuh Date: Tue, 23 May 2023 14:32:23 +0000 (+0200) Subject: meson: require 0.57 X-Git-Tag: v2.40-rc1~431^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2cd74462ea28928121535ff7dd1a13c28a79624;p=thirdparty%2Futil-linux.git meson: require 0.57 It is needed for fs.read() Signed-off-by: Thomas Weißschuh --- diff --git a/libmount/meson.build b/libmount/meson.build index 42b6b75e67..c52e2bed53 100644 --- a/libmount/meson.build +++ b/libmount/meson.build @@ -141,7 +141,7 @@ foreach libmount_test: libmount_tests c_args : ['-DTEST_PROGRAM'], ) # the test-setup expects the helpers in the toplevel build-directory - link = meson.build_root() / test_name + link = meson.project_build_root() / test_name run_command('ln', '-srf', exe.full_path(), link, check : true) endforeach diff --git a/meson.build b/meson.build index 029f93cf49..5eb6acb9df 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('util-linux', 'c', version : run_command('tools/git-version-gen', check: true).stdout(), - meson_version: '>=0.53.0', + meson_version: '>=0.57.0', license : 'GPLv2+') pkgconfig = import('pkgconfig') @@ -3365,7 +3365,7 @@ configure_file(output : 'meson.conf', '''asan=@0@ PYTHON=@1@ '''.format(get_option('b_sanitize')=='address' ? 'yes' : '', - python.path())]) + python.full_path())]) run_sh = find_program('tests/run.sh') run_target(