openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

meson: Detect libfuse 

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201027190600.192171-2-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2020-10-27 20:05:41 +01:00 committed by Kevin Wolf
parent c208b0ef96
commit a484a71957
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -449,6 +449,7 @@ meson=""
ninja="" ninja=""
skip_meson=no skip_meson=no
gettext="" gettext=""
fuse="auto"
bogus_os="no" bogus_os="no"
malloc_trim="auto" malloc_trim="auto"
@ -1525,6 +1526,10 @@ for opt do
;; ;;
--disable-libdaxctl) libdaxctl=no --disable-libdaxctl) libdaxctl=no
;; ;;
--enable-fuse) fuse="enabled"
;;
--disable-fuse) fuse="disabled"
;;
*) *)
echo "ERROR: unknown option $opt" echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information" echo "Try '$0 --help' for more information"
@ -1850,6 +1855,7 @@ disabled with --disable-FEATURE, default is enabled if available:
xkbcommon xkbcommon support xkbcommon xkbcommon support
rng-none dummy RNG, avoid using /dev/(u)random and getrandom() rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
libdaxctl libdaxctl support libdaxctl libdaxctl support
fuse FUSE block device export
NOTE: The object files are built at the place where configure is launched NOTE: The object files are built at the place where configure is launched
EOF EOF
@ -7014,6 +7020,7 @@ NINJA=$ninja $meson setup \
-Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-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 \
$cross_arg \ $cross_arg \
"$PWD" "$source_path" "$PWD" "$source_path"

6
meson.build
View File

@ -773,6 +773,10 @@ elif get_option('vhost_user_blk_server').disabled() or not have_system
have_vhost_user_blk_server = false have_vhost_user_blk_server = false
endif endif
fuse = dependency('fuse3', required: get_option('fuse'),
version: '>=3.1', method: 'pkg-config',
static: enable_static)
################# #################
# config-host.h # # config-host.h #
################# #################
@ -807,6 +811,7 @@ config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
config_host_data.set('CONFIG_GETTID', has_gettid) config_host_data.set('CONFIG_GETTID', has_gettid)
config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim) config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim)
config_host_data.set('CONFIG_STATX', has_statx) config_host_data.set('CONFIG_STATX', has_statx)
config_host_data.set('CONFIG_FUSE', fuse.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version())) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0]) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
@ -2208,6 +2213,7 @@ endif
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')} summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')} summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')} summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary_info += {'FUSE exports': fuse.found()}
summary(summary_info, bool_yn: true) summary(summary_info, bool_yn: true)
if not supported_cpus.contains(cpu) if not supported_cpus.contains(cpu)

2
meson_options.txt
View File

@ -66,6 +66,8 @@ option('virtiofsd', type: 'feature', value: 'auto',
description: 'build virtiofs daemon (virtiofsd)') description: 'build virtiofs daemon (virtiofsd)')
option('vhost_user_blk_server', type: 'feature', value: 'auto', option('vhost_user_blk_server', type: 'feature', value: 'auto',
description: 'build vhost-user-blk server') description: 'build vhost-user-blk server')
option('fuse', type: 'feature', value: 'auto',
description: 'FUSE block device export')
option('capstone', type: 'combo', value: 'auto', option('capstone', type: 'combo', value: 'auto',
choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],