mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson.build: convert --with-default-devices to meson

Browse Source 
Pass the boolean option directly instead of writing
CONFIG_MINIKCONF_MODE to config-host.mak.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-11-20 08:38:22 +01:00
parent f7f2d65135
commit 7bc3ca7fc0
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -446,7 +446,7 @@ sheepdog="no"
libxml2="$default_feature" libxml2="$default_feature"
debug_mutex="no" debug_mutex="no"
libpmem="$default_feature" libpmem="$default_feature"
default_devices="yes" default_devices="true"
plugins="no" plugins="no"
fuzzing="no" fuzzing="no"
rng_none="no" rng_none="no"
@ -943,9 +943,9 @@ for opt do
;; ;;
--with-trace-file=*) trace_file="$optarg" --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 --without-default-features) # processed above
;; ;;
@ -5572,11 +5572,6 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak
echo "ARCH=$ARCH" >> $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 if test "$debug_tcg" = "yes" ; then
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
fi fi
@ -6540,7 +6535,7 @@ NINJA=$ninja $meson setup \
-Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
-Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ -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 \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
-Dvhost_user_blk_server=$vhost_user_blk_server \ -Dvhost_user_blk_server=$vhost_user_blk_server \
-Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \

5
meson.build
View File

@ -1284,7 +1284,8 @@ foreach target : target_dirs
output: config_devices_mak, output: config_devices_mak,
depfile: config_devices_mak + '.d', depfile: config_devices_mak + '.d',
capture: true, capture: true,
command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], command: [minikconf,
get_option('default_devices') ? '--defconfig' : '--allnoconfig',
config_devices_mak, '@DEPFILE@', '@INPUT@', config_devices_mak, '@DEPFILE@', '@INPUT@',
host_kconfig, accel_kconfig]) host_kconfig, accel_kconfig])
@ -2478,7 +2479,7 @@ summary_info += {'capstone': capstone_opt == 'disabled' ? false : capst
summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')} summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')} summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()} summary_info += {'libudev': libudev.found()}
summary_info += {'default devices': config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'} summary_info += {'default devices': get_option('default_devices')}
summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')} summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')}
summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
if config_host.has_key('HAVE_GDB_BIN') if config_host.has_key('HAVE_GDB_BIN')

2
meson_options.txt
View File

@ -7,6 +7,8 @@ option('qemu_firmwarepath', type : 'string', value : '',
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('default_devices', type : 'boolean', value : true,
description: 'Include a default selection of devices in emulators')
option('docs', type : 'feature', value : 'auto', option('docs', type : 'feature', value : 'auto',
description: 'Documentations build support') description: 'Documentations build support')
option('gettext', type : 'feature', value : 'auto', option('gettext', type : 'feature', value : 'auto',