OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure, meson: move CONFIG_IASL to a Meson option

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-10-13 13:19:00 +02:00
parent b7e4ab15c3
commit 5dc4618e78
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2969,9 +2969,6 @@ echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak echo "CC=$cc" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
echo "CONFIG_IASL=$iasl" >> $config_host_mak
fi
echo "AR=$ar" >> $config_host_mak echo "AR=$ar" >> $config_host_mak
echo "AS=$as" >> $config_host_mak echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak
@ -3189,6 +3186,7 @@ if test "$skip_meson" = no; then
-Daudio_drv_list=$audio_drv_list \ -Daudio_drv_list=$audio_drv_list \
-Ddefault_devices=$default_devices \ -Ddefault_devices=$default_devices \
-Ddocdir="$docdir" \ -Ddocdir="$docdir" \
-Diasl="$($iasl -h >/dev/null 2>&1 && printf %s "$iasl")" \
-Dqemu_firmwarepath="$firmwarepath" \ -Dqemu_firmwarepath="$firmwarepath" \
-Dqemu_suffix="$qemu_suffix" \ -Dqemu_suffix="$qemu_suffix" \
-Dsmbd="$smbd" \ -Dsmbd="$smbd" \

12
meson.build
View File

@ -1463,7 +1463,9 @@ foreach k : get_option('trace_backends')
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
endforeach endforeach
config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file')) config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
if get_option('iasl') != ''
config_host_data.set_quoted('CONFIG_IASL', get_option('iasl'))
endif
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir')) config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix')) config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir) config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
@ -1957,7 +1959,6 @@ config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
'HAVE_GDB_BIN'] 'HAVE_GDB_BIN']
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
strings = ['CONFIG_IASL']
foreach k, v: config_host foreach k, v: config_host
if ignored.contains(k) if ignored.contains(k)
# do nothing # do nothing
@ -1966,8 +1967,6 @@ foreach k, v: config_host
v = '"' + '", "'.join(v.split()) + '", ' v = '"' + '", "'.join(v.split()) + '", '
endif endif
config_host_data.set(k, v) config_host_data.set(k, v)
elif strings.contains(k)
config_host_data.set_quoted(k, v)
elif k.startswith('CONFIG_') elif k.startswith('CONFIG_')
config_host_data.set(k, v == 'y' ? 1 : v) config_host_data.set(k, v == 'y' ? 1 : v)
endif endif
@ -3375,6 +3374,11 @@ summary_info += {'sphinx-build': sphinx_build}
if config_host.has_key('HAVE_GDB_BIN') if config_host.has_key('HAVE_GDB_BIN')
summary_info += {'gdb': config_host['HAVE_GDB_BIN']} summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
endif endif
if get_option('iasl') != ''
summary_info += {'iasl': get_option('iasl')}
else
summary_info += {'iasl': false}
endif
summary_info += {'genisoimage': config_host['GENISOIMAGE']} summary_info += {'genisoimage': config_host['GENISOIMAGE']}
if targetos == 'windows' and have_ga if targetos == 'windows' and have_ga
summary_info += {'wixl': wixl} summary_info += {'wixl': wixl}

2
meson_options.txt
View File

@ -12,6 +12,8 @@ option('smbd', type : 'string', value : '',
description: 'Path to smbd for slirp networking') description: 'Path to smbd for slirp networking')
option('sphinx_build', type : 'string', value : '', option('sphinx_build', type : 'string', value : '',
description: 'Use specified sphinx-build [$sphinx_build] for building document (default to be empty)') description: 'Use specified sphinx-build [$sphinx_build] for building document (default to be empty)')
option('iasl', type : 'string', value : '',
description: 'Path to ACPI disassembler')
option('default_devices', type : 'boolean', value : true, option('default_devices', type : 'boolean', value : true,
description: 'Include a default selection of devices in emulators') description: 'Include a default selection of devices in emulators')
option('audio_drv_list', type: 'array', value: ['default'], option('audio_drv_list', type: 'array', value: ['default'],

1
scripts/meson-buildoptions.py
View File

@ -30,6 +30,7 @@ SKIP_OPTIONS = {
"default_devices", "default_devices",
"docdir", "docdir",
"fuzzing_engine", "fuzzing_engine",
"iasl",
"qemu_firmwarepath", "qemu_firmwarepath",
"qemu_suffix", "qemu_suffix",
"smbd", "smbd",