diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-13 22:49:01 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-10-25 15:56:32 +0200 |
| commit | 650bfc1a302fb7c7bdad2f5628fa047f5c57299e (patch) | |
| tree | f53e4fb687602abef5f7e68255ed775d4fbd3d61 | |
| parent | db5741f2475a50d7f274984693d4f8aba0e7a8f8 (diff) | |
| download | gvfs-650bfc1a302fb7c7bdad2f5628fa047f5c57299e.tar.gz | |
build: Make use of the new full_path method
The external program object returned by `find_program()` has been
fixed and its `path` method has been deprecated and `full_path` is
the method to be called[0].
The deprecated `path` method has been updated in meson build files.
Required meson version has also been bumped to 0.55.
[0] https://mesonbuild.com/Release-notes-for-0-55-0.html#find_program-fixes-when-the-program-has-been-overridden-by-executable
| -rw-r--r-- | daemon/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index c89ef407..f70083f2 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -256,7 +256,7 @@ if enable_sftp '-DDEFAULT_BACKEND_TYPE=sftp', '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', '-DMAX_JOB_THREADS=1', - '-DSSH_PROGRAM="@0@"'.format(ssh.path()), + '-DSSH_PROGRAM="@0@"'.format(ssh.full_path()), ] programs += [['gvfsd-sftp', {'sources': sources, 'dependencies': deps, 'c_args': cflags}]] diff --git a/meson.build b/meson.build index bca30b89..1bf12101 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( version: '1.49.1', license: 'LGPL2+', default_options: 'buildtype=debugoptimized', - meson_version: '>= 0.53.0', + meson_version: '>= 0.55.0', ) gvfs_name = meson.project_name() |