| Message ID | 20220420153407.73926-17-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Misc meson conversions for QEMU 7.1 | expand |
On Wed, Apr 20, 2022 at 7:52 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > configure | 2 +- > meson.build | 16 +++++++++------- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 11d3cc19ca..772714d386 100755 > --- a/configure > +++ b/configure > @@ -2507,7 +2507,7 @@ if test "$skip_meson" = no; then > -Daudio_drv_list=$audio_drv_list \ > -Ddefault_devices=$default_devices \ > -Ddocdir="$docdir" \ > - -Diasl="$($iasl -h >/dev/null 2>&1 && printf %s "$iasl")" \ > + -Diasl="$iasl" \ > -Dqemu_firmwarepath="$firmwarepath" \ > -Dqemu_suffix="$qemu_suffix" \ > -Dsmbd="$smbd" \ > diff --git a/meson.build b/meson.build > index 7cbb771393..d255facbfd 100644 > --- a/meson.build > +++ b/meson.build > @@ -167,6 +167,12 @@ if 'dtrace' in get_option('trace_backends') > endif > endif > > +if get_option('iasl') == '' > + iasl = find_program('iasl', required: false) > +else > + iasl = find_program(get_option('iasl'), required: true) > +endif > + > ################## > # Compiler flags # > ################## > @@ -1582,8 +1588,8 @@ foreach k : get_option('trace_backends') > config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) > endforeach > 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')) > +if iasl.found() > + config_host_data.set_quoted('CONFIG_IASL', iasl.full_path()) > endif > config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / > get_option('bindir')) > config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix')) > @@ -3617,11 +3623,7 @@ summary_info += {'sphinx-build': sphinx_build} > if config_host.has_key('HAVE_GDB_BIN') > summary_info += {'gdb': config_host['HAVE_GDB_BIN']} > endif > -if get_option('iasl') != '' > - summary_info += {'iasl': get_option('iasl')} > -else > - summary_info += {'iasl': false} > -endif > +summary_info += {'iasl': iasl} > summary_info += {'genisoimage': config_host['GENISOIMAGE']} > if targetos == 'windows' and have_ga > summary_info += {'wixl': wixl} > -- > 2.35.1 > > > >
diff --git a/configure b/configure index 11d3cc19ca..772714d386 100755 --- a/configure +++ b/configure @@ -2507,7 +2507,7 @@ if test "$skip_meson" = no; then -Daudio_drv_list=$audio_drv_list \ -Ddefault_devices=$default_devices \ -Ddocdir="$docdir" \ - -Diasl="$($iasl -h >/dev/null 2>&1 && printf %s "$iasl")" \ + -Diasl="$iasl" \ -Dqemu_firmwarepath="$firmwarepath" \ -Dqemu_suffix="$qemu_suffix" \ -Dsmbd="$smbd" \ diff --git a/meson.build b/meson.build index 7cbb771393..d255facbfd 100644 --- a/meson.build +++ b/meson.build @@ -167,6 +167,12 @@ if 'dtrace' in get_option('trace_backends') endif endif +if get_option('iasl') == '' + iasl = find_program('iasl', required: false) +else + iasl = find_program(get_option('iasl'), required: true) +endif + ################## # Compiler flags # ################## @@ -1582,8 +1588,8 @@ foreach k : get_option('trace_backends') config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) endforeach 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')) +if iasl.found() + config_host_data.set_quoted('CONFIG_IASL', iasl.full_path()) endif config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir')) config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix')) @@ -3617,11 +3623,7 @@ summary_info += {'sphinx-build': sphinx_build} if config_host.has_key('HAVE_GDB_BIN') summary_info += {'gdb': config_host['HAVE_GDB_BIN']} endif -if get_option('iasl') != '' - summary_info += {'iasl': get_option('iasl')} -else - summary_info += {'iasl': false} -endif +summary_info += {'iasl': iasl} summary_info += {'genisoimage': config_host['GENISOIMAGE']} if targetos == 'windows' and have_ga summary_info += {'wixl': wixl}
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- configure | 2 +- meson.build | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-)