mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: use meson datadir instead of qemu_datadir

Browse Source 
When cross-compiling, by default qemu_datadir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-6-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-08-26 15:04:16 +04:00 committed by Paolo Bonzini
parent 73f3aa3766
commit ab4c0996f8
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/vhost-user-gpu/meson.build
View File

@ -10,5 +10,5 @@ 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: config_host,
install_dir: config_host['qemu_datadir'] / 'vhost-user')
install_dir: qemu_datadir / 'vhost-user')
endif

3
meson.build
View File

@ -18,6 +18,7 @@ config_all_disas = keyval.load(meson.current_build_dir() / 'config-all-disas.mak
enable_modules = 'CONFIG_MODULES' in config_host
enable_static = 'CONFIG_STATIC' in config_host
build_docs = 'BUILD_DOCS' in config_host
qemu_datadir = get_option('datadir') / get_option('qemu_suffix')
config_host_data = configuration_data()
genh = []
@ -1055,7 +1056,7 @@ foreach target : target_dirs
output: exe['name'] + stp['ext'],
capture: true,
install: stp['install'],
install_dir: config_host['qemu_datadir'] / '../systemtap/tapset',
install_dir: qemu_datadir / '../systemtap/tapset',
command: [
tracetool, '--group=all', '--format=' + stp['fmt'],
'--binary=' + stp['bin'],

2
meson_options.txt
View File

@ -1,4 +1,4 @@
option('qemu_suffix', type : 'string', value: '/qemu',
option('qemu_suffix', type : 'string', value: 'qemu',
description: 'Suffix for QEMU data/modules/config directories (can be empty)')
option('gettext', type : 'boolean', value : true)
option('sdl', type : 'feature', value : 'auto')

2
pc-bios/descriptors/meson.build
View File

@ -10,5 +10,5 @@ foreach f: [
output: f,
configuration: {'DATADIR': config_host['qemu_datadir']},
install: install_blobs,
install_dir: config_host['qemu_datadir'] / 'firmware')
install_dir: qemu_datadir / 'firmware')
endforeach

6
pc-bios/keymaps/meson.build
View File

@ -44,13 +44,13 @@ foreach km, args: keymaps
build_by_default: true,
output: km,
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
install_dir: config_host['qemu_datadir'] / 'keymaps')
install_dir: qemu_datadir / 'keymaps')
endforeach
if t.length() > 0
alias_target('update-keymaps', t)
else
# install from the source tree
install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / 'keymaps')
install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
endif
install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'keymaps')
install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')

2
pc-bios/meson.build
View File

@ -19,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
input: '@0@.bz2'.format(f),
capture: true,
install: install_blobs,
install_dir: config_host['qemu_datadir'],
install_dir: qemu_datadir,
command: [ bzip2, '-dc', '@INPUT0@' ])
endforeach
endif

2
tools/virtiofsd/meson.build
View File

@ -16,4 +16,4 @@ executable('virtiofsd', files(
configure_file(input: '50-qemu-virtiofsd.json.in',
output: '50-qemu-virtiofsd.json',
configuration: config_host,
install_dir: config_host['qemu_datadir'] / 'vhost-user')
install_dir: qemu_datadir / 'vhost-user')

2
trace/meson.build
View File

@ -58,7 +58,7 @@ trace_events_all = custom_target('trace-events-all',
command: [ 'cat', '@INPUT@' ],
capture: true,
install: true,
install_dir: config_host['qemu_datadir'])
install_dir: qemu_datadir)
foreach d : [
['generated-tcg-tracers.h', 'tcg-h'],