diff options
| author | Paolo Bonzini | 2020-11-20 08:38:22 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2021-01-06 10:21:20 +0100 |
| commit | 7bc3ca7fc03fdec3173a049c56bf6382f9007e9f (patch) | |
| tree | 541566b5ba4b8ac4b1cd9b1aea7b20bfc2d8cced /configure | |
| parent | libattr: convert to meson (diff) | |
| download | qemu-7bc3ca7fc03fdec3173a049c56bf6382f9007e9f.tar.gz qemu-7bc3ca7fc03fdec3173a049c56bf6382f9007e9f.tar.xz qemu-7bc3ca7fc03fdec3173a049c56bf6382f9007e9f.zip | |
meson.build: convert --with-default-devices to meson
Pass the boolean option directly instead of writing
CONFIG_MINIKCONF_MODE to config-host.mak.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -446,7 +446,7 @@ sheepdog="no" libxml2="$default_feature" debug_mutex="no" libpmem="$default_feature" -default_devices="yes" +default_devices="true" plugins="no" fuzzing="no" rng_none="no" @@ -943,9 +943,9 @@ for opt do ;; --with-trace-file=*) trace_file="$optarg" ;; - --with-default-devices) default_devices="yes" + --with-default-devices) default_devices="true" ;; - --without-default-devices) default_devices="no" + --without-default-devices) default_devices="false" ;; --without-default-features) # processed above ;; @@ -5572,11 +5572,6 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak -if test "$default_devices" = "yes" ; then - echo "CONFIG_MINIKCONF_MODE=--defconfig" >> $config_host_mak -else - echo "CONFIG_MINIKCONF_MODE=--allnoconfig" >> $config_host_mak -fi if test "$debug_tcg" = "yes" ; then echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak fi @@ -6540,7 +6535,7 @@ NINJA=$ninja $meson setup \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ - -Dattr=$attr \ + -Dattr=$attr -Ddefault_devices=$default_devices \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ -Dvhost_user_blk_server=$vhost_user_blk_server \ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \ |