mirror of
https://github.com/qemu/qemu.git
synced 2024-11-27 22:03:35 +08:00
configure, meson: move --enable-modules to Meson
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
877c556705
commit
6002711c66
20
configure
vendored
20
configure
vendored
@ -280,7 +280,6 @@ tsan="no"
|
||||
fortify_source="yes"
|
||||
docs="auto"
|
||||
EXESUF=""
|
||||
modules="no"
|
||||
prefix="/usr/local"
|
||||
qemu_suffix="qemu"
|
||||
softmmu="yes"
|
||||
@ -751,12 +750,6 @@ for opt do
|
||||
;;
|
||||
--disable-docs) docs=disabled
|
||||
;;
|
||||
--enable-modules)
|
||||
modules="yes"
|
||||
;;
|
||||
--disable-modules)
|
||||
modules="no"
|
||||
;;
|
||||
--cpu=*)
|
||||
;;
|
||||
--target-list=*) target_list="$optarg"
|
||||
@ -1051,7 +1044,6 @@ cat << EOF
|
||||
linux-user all linux usermode emulation targets
|
||||
bsd-user all BSD usermode emulation targets
|
||||
pie Position Independent Executables
|
||||
modules modules support (non-Windows)
|
||||
debug-tcg TCG debugging (default is disabled)
|
||||
debug-info debugging information
|
||||
safe-stack SafeStack Stack Smash Protection. Depends on
|
||||
@ -1342,16 +1334,7 @@ EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
# Our module code doesn't support Windows
|
||||
if test "$modules" = "yes" && test "$mingw32" = "yes" ; then
|
||||
error_exit "Modules are not available for Windows"
|
||||
fi
|
||||
|
||||
# Static linking is not possible with plugins, modules or PIE
|
||||
if test "$static" = "yes" ; then
|
||||
if test "$modules" = "yes" ; then
|
||||
error_exit "static and modules are mutually incompatible"
|
||||
fi
|
||||
if test "$plugins" = "yes"; then
|
||||
error_exit "static and plugins are mutually incompatible"
|
||||
else
|
||||
@ -2308,9 +2291,6 @@ if test "$solaris" = "yes" ; then
|
||||
fi
|
||||
echo "SRC_PATH=$source_path" >> $config_host_mak
|
||||
echo "TARGET_DIRS=$target_list" >> $config_host_mak
|
||||
if test "$modules" = "yes"; then
|
||||
echo "CONFIG_MODULES=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
# XXX: suppress that
|
||||
if [ "$bsd" = "yes" ] ; then
|
||||
|
||||
22
meson.build
22
meson.build
@ -17,7 +17,6 @@ fs = import('fs')
|
||||
targetos = host_machine.system()
|
||||
sh = find_program('sh')
|
||||
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
|
||||
enable_modules = 'CONFIG_MODULES' in config_host
|
||||
|
||||
cc = meson.get_compiler('c')
|
||||
all_languages = ['c']
|
||||
@ -84,6 +83,12 @@ have_ga = get_option('guest_agent') \
|
||||
.require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd', 'openbsd'],
|
||||
error_message: 'unsupported OS for QEMU guest agent') \
|
||||
.allowed()
|
||||
enable_modules = get_option('modules') \
|
||||
.require(targetos != 'windows',
|
||||
error_message: 'Modules are not available for Windows') \
|
||||
.require(not get_option('prefer_static'),
|
||||
error_message: 'Modules are incompatible with static linking') \
|
||||
.allowed()
|
||||
have_block = have_system or have_tools
|
||||
|
||||
python = import('python').find_installation()
|
||||
@ -498,7 +503,7 @@ glib_req_ver = '>=2.56.0'
|
||||
glib_pc = dependency('glib-2.0', version: glib_req_ver, required: true,
|
||||
method: 'pkg-config')
|
||||
glib_cflags = []
|
||||
if config_host.has_key('CONFIG_MODULES')
|
||||
if enable_modules
|
||||
gmodule = dependency('gmodule-export-2.0', version: glib_req_ver, required: true,
|
||||
method: 'pkg-config')
|
||||
elif config_host.has_key('CONFIG_PLUGIN')
|
||||
@ -1725,7 +1730,7 @@ if get_option('cfi')
|
||||
if not get_option('b_lto')
|
||||
error('Selected Control-Flow Integrity but LTO is disabled')
|
||||
endif
|
||||
if config_host.has_key('CONFIG_MODULES')
|
||||
if enable_modules
|
||||
error('Selected Control-Flow Integrity is not compatible with modules')
|
||||
endif
|
||||
# Check for cfi flags. CFI requires LTO so we can't use
|
||||
@ -1828,7 +1833,7 @@ config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') /
|
||||
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
|
||||
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
|
||||
|
||||
if config_host.has_key('CONFIG_MODULES')
|
||||
if enable_modules
|
||||
config_host_data.set('CONFIG_STAMP', run_command(
|
||||
meson.current_source_dir() / 'scripts/qemu-stamp.py',
|
||||
meson.project_version(), get_option('pkgversion'), '--',
|
||||
@ -1891,6 +1896,7 @@ config_host_data.set('CONFIG_LIBSSH', libssh.found())
|
||||
config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
|
||||
config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
|
||||
config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
|
||||
config_host_data.set('CONFIG_MODULES', enable_modules)
|
||||
config_host_data.set('CONFIG_NUMA', numa.found())
|
||||
if numa.found()
|
||||
config_host_data.set('HAVE_NUMA_HAS_PREFERRED_MANY',
|
||||
@ -3254,7 +3260,7 @@ foreach d, list : modules
|
||||
endif
|
||||
|
||||
foreach m, module_ss : list
|
||||
if enable_modules and targetos != 'windows'
|
||||
if enable_modules
|
||||
module_ss = module_ss.apply(config_all, strict: false)
|
||||
sl = static_library(d + '-' + m, [genh, module_ss.sources()],
|
||||
dependencies: [modulecommon, module_ss.dependencies()], pic: true)
|
||||
@ -3287,7 +3293,7 @@ endforeach
|
||||
|
||||
foreach d, list : target_modules
|
||||
foreach m, module_ss : list
|
||||
if enable_modules and targetos != 'windows'
|
||||
if enable_modules
|
||||
foreach target : target_dirs
|
||||
if target.endswith('-softmmu')
|
||||
config_target = config_target_mak[target]
|
||||
@ -3807,8 +3813,8 @@ summary_info += {'system-mode emulation': have_system}
|
||||
summary_info += {'user-mode emulation': have_user}
|
||||
summary_info += {'block layer': have_block}
|
||||
summary_info += {'Install blobs': get_option('install_blobs')}
|
||||
summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
|
||||
if config_host.has_key('CONFIG_MODULES')
|
||||
summary_info += {'module support': enable_modules}
|
||||
if enable_modules
|
||||
summary_info += {'alternative module path': get_option('module_upgrades')}
|
||||
endif
|
||||
summary_info += {'fuzzing support': get_option('fuzzing')}
|
||||
|
||||
@ -42,6 +42,8 @@ option('fuzzing', type : 'boolean', value: false,
|
||||
description: 'build fuzzing targets')
|
||||
option('gettext', type : 'feature', value : 'auto',
|
||||
description: 'Localization of the GTK+ user interface')
|
||||
option('modules', type : 'feature', value : 'disabled',
|
||||
description: 'modules support (non Windows)')
|
||||
option('module_upgrades', type : 'boolean', value : false,
|
||||
description: 'try to load modules from alternate paths for upgrades')
|
||||
option('install_blobs', type : 'boolean', value : true,
|
||||
|
||||
@ -127,6 +127,7 @@ meson_options_help() {
|
||||
printf "%s\n" ' lzo lzo compression support'
|
||||
printf "%s\n" ' malloc-trim enable libc malloc_trim() for memory optimization'
|
||||
printf "%s\n" ' membarrier membarrier system call (for Linux 4.14+ or Windows'
|
||||
printf "%s\n" ' modules modules support (non Windows)'
|
||||
printf "%s\n" ' mpath Multipath persistent reservation passthrough'
|
||||
printf "%s\n" ' multiprocess Out of process device emulation support'
|
||||
printf "%s\n" ' netmap netmap network backend support'
|
||||
@ -359,6 +360,8 @@ _meson_option_parse() {
|
||||
--disable-membarrier) printf "%s" -Dmembarrier=disabled ;;
|
||||
--enable-module-upgrades) printf "%s" -Dmodule_upgrades=true ;;
|
||||
--disable-module-upgrades) printf "%s" -Dmodule_upgrades=false ;;
|
||||
--enable-modules) printf "%s" -Dmodules=enabled ;;
|
||||
--disable-modules) printf "%s" -Dmodules=disabled ;;
|
||||
--enable-mpath) printf "%s" -Dmpath=enabled ;;
|
||||
--disable-mpath) printf "%s" -Dmpath=disabled ;;
|
||||
--enable-multiprocess) printf "%s" -Dmultiprocess=enabled ;;
|
||||
|
||||
@ -23,7 +23,7 @@ qtests_generic = [
|
||||
'readconfig-test',
|
||||
'netdev-socket',
|
||||
]
|
||||
if config_host.has_key('CONFIG_MODULES')
|
||||
if enable_modules
|
||||
qtests_generic += [ 'modules-test' ]
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user