On Wed, Apr 20, 2022 at 8:13 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> This has no functional change, it only makes the command line shorter
> and nicer.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> configure | 29 +++++++++++++++++------------
> meson.build | 2 +-
> meson_options.txt | 2 +-
> 3 files changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/configure b/configure
> index 4997983b5d..61b5acae10 100755
> --- a/configure
> +++ b/configure
> @@ -2349,19 +2349,24 @@ if test "$skip_meson" = no; then
> mv $cross config-meson.cross
>
> rm -rf meson-private meson-info meson-logs
> +
> + # Built-in options
> + test "$bindir" != "bin" && meson_option_add "-Dbindir=$bindir"
> + test "$default_feature" = no && meson_option_add
> -Dauto_features=disabled
> + test "$pie" = no && meson_option_add -Db_pie=false
> + test "$werror" = yes && meson_option_add -Dwerror=true
> +
> + # QEMU options
> + test "$capstone" != auto && meson_option_add "-Dcapstone=$capstone"
> + test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
> + test "$fdt" != auto && meson_option_add "-Dfdt=$fdt"
> + test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add
> "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
> + test "$qemu_suffix" != qemu && meson_option_add
> "-Dqemu_suffix=$qemu_suffix"
> + test "$slirp" != auto && meson_option_add "-Dslirp=$slirp"
> + test "$smbd" != '' && meson_option_add "-Dsmbd=$smbd"
> + test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg"
> run_meson() {
> - NINJA=$ninja $meson setup \
> - --prefix "$prefix" \
> - --bindir "$bindir" \
> - -Dqemu_suffix="$qemu_suffix" \
> - -Dsmbd="$smbd" \
> - -Dwerror=$(if test "$werror" = yes; then echo true; else echo
> false; fi) \
> - -Db_pie=$(if test "$pie" = yes; then echo true; else echo false;
> fi) \
> - -Dcfi=$cfi -Dtcg=$tcg \
> - -Dcapstone=$capstone -Dfdt=$fdt -Dslirp=$slirp \
> - $(test -n "${LIB_FUZZING_ENGINE+xxx}" && echo
> "-Dfuzzing_engine=$LIB_FUZZING_ENGINE") \
> - $(if test "$default_feature" = no; then echo
> "-Dauto_features=disabled"; fi) \
> - "$@" $cross_arg "$PWD" "$source_path"
> + NINJA=$ninja $meson setup --prefix "$prefix" "$@" $cross_arg "$PWD"
> "$source_path"
> }
> eval run_meson $meson_options
> if test "$?" -ne 0 ; then
> diff --git a/meson.build b/meson.build
> index 60e8c302e6..ff5c076805 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1,6 +1,6 @@
> project('qemu', ['c'], meson_version: '>=0.59.3',
> default_options: ['warning_level=1', 'c_std=gnu11',
> 'cpp_std=gnu++11', 'b_colorout=auto',
> - 'b_staticpic=false', 'stdsplit=false',
> 'optimization=2'],
> + 'b_staticpic=false', 'stdsplit=false',
> 'optimization=2', 'b_pie=true'],
> version: files('VERSION'))
>
> add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default:
> true)
> diff --git a/meson_options.txt b/meson_options.txt
> index a76fadbd7d..8efd5f520c 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -78,7 +78,7 @@ option('xen', type: 'feature', value: 'auto',
> description: 'Xen backend support')
> option('xen_pci_passthrough', type: 'feature', value: 'auto',
> description: 'Xen PCI passthrough support')
> -option('tcg', type: 'feature', value: 'auto',
> +option('tcg', type: 'feature', value: 'enabled',
> description: 'TCG support')
> option('tcg_interpreter', type: 'boolean', value: false,
> description: 'TCG with bytecode interpreter (slow)')
> --
> 2.35.1
>
>
>
>
--
Marc-André Lureau
