diff options
| author | Marc Hartmayer | 2020-11-03 12:23:33 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-11-03 15:42:53 +0100 |
| commit | cd57deabad8f60a6b0d135318810909bc0b7a93f (patch) | |
| tree | 940f75c080f57beb97a9f2f2499ad07ef8d57774 | |
| parent | meson: use b_staticpic=false for meson >=0.56.0 (diff) | |
| download | qemu-cd57deabad8f60a6b0d135318810909bc0b7a93f.tar.gz qemu-cd57deabad8f60a6b0d135318810909bc0b7a93f.tar.xz qemu-cd57deabad8f60a6b0d135318810909bc0b7a93f.zip | |
meson: vhost-user-gpu/virtiofsd: use absolute path
The option `libexecdir` is relative to `prefix` (see
https://mesonbuild.com/Builtin-options.html), so we have to be aware
of this when creating 50-qemu-gpu.json and
50-qemu-virtiofsd.json. Otherwise, tools like libvirt will not be able
to find the executable.
Fixes: 16bf7a3326d8 ("configure: move directory options from config-host.mak to meson")
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20201103112333.24734-1-mhartmay@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | contrib/vhost-user-gpu/meson.build | 2 | ||||
| -rw-r--r-- | tools/virtiofsd/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build index 37ecca13ca..c487ca72c1 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -9,6 +9,6 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \ configure_file(input: '50-qemu-gpu.json.in', output: '50-qemu-gpu.json', - configuration: { 'libexecdir' : get_option('libexecdir') }, + configuration: { 'libexecdir' : get_option('prefix') / get_option('libexecdir') }, install_dir: qemu_datadir / 'vhost-user') endif diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index e1a4dc98d9..17edecf55c 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -15,5 +15,5 @@ executable('virtiofsd', files( configure_file(input: '50-qemu-virtiofsd.json.in', output: '50-qemu-virtiofsd.json', - configuration: { 'libexecdir' : get_option('libexecdir') }, + configuration: { 'libexecdir' : get_option('prefix') / get_option('libexecdir') }, install_dir: qemu_datadir / 'vhost-user') |