[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/25] configure, meson: move iasl detection to meson
From: |
Paolo Bonzini |
Subject: |
[PULL 06/25] configure, meson: move iasl detection to meson |
Date: |
Fri, 29 Apr 2022 17:22:53 +0200 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
meson.build | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 519982800e..b146763fbd 100755
--- a/configure
+++ b/configure
@@ -2508,7 +2508,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 50eb19e0ba..84f3ae7bd6 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 #
##################
@@ -1584,8 +1590,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'))
@@ -3630,11 +3636,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
- [PULL 00/25] Misc patches for 2022-04-29, Paolo Bonzini, 2022/04/29
- [PULL 02/25] configure: Add cross prefix for widl tool, Paolo Bonzini, 2022/04/29
- [PULL 04/25] meson-buildoptions: add support for string options, Paolo Bonzini, 2022/04/29
- [PULL 01/25] WHPX: support for xcr0, Paolo Bonzini, 2022/04/29
- [PULL 03/25] qga-vss: always build qga-vss.tlb when qga-vss.dll is built, Paolo Bonzini, 2022/04/29
- [PULL 06/25] configure, meson: move iasl detection to meson,
Paolo Bonzini <=
- [PULL 08/25] configure: switch string options to automatic parsing, Paolo Bonzini, 2022/04/29
- [PULL 05/25] meson, configure: move Xen detection to meson, Paolo Bonzini, 2022/04/29
- [PULL 09/25] meson, configure: move --tls-priority to meson, Paolo Bonzini, 2022/04/29
- [PULL 10/25] meson, configure: move bdrv whitelists to meson, Paolo Bonzini, 2022/04/29
- [PULL 11/25] meson, configure: move --with-pkgversion, CONFIG_STAMP to meson, Paolo Bonzini, 2022/04/29
- [PULL 07/25] configure: move Windows flags detection to meson, Paolo Bonzini, 2022/04/29
- [PULL 12/25] meson, configure: move --interp-prefix to meson, Paolo Bonzini, 2022/04/29
- [PULL 13/25] meson: always combine directories with prefix, Paolo Bonzini, 2022/04/29
- [PULL 17/25] meson, virtio: place all virtio-pci devices under virtio_pci_ss, Paolo Bonzini, 2022/04/29
- [PULL 16/25] configure: omit options with default values from meson command line, Paolo Bonzini, 2022/04/29