mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-06 19:19:41 +00:00
meson: move libudev test
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
19ca8285fc
commit
f01496a314
14
configure
vendored
14
configure
vendored
|
@ -908,7 +908,6 @@ Linux)
|
||||||
linux_user="yes"
|
linux_user="yes"
|
||||||
kvm="yes"
|
kvm="yes"
|
||||||
QEMU_INCLUDES="-isystem ${source_path}/linux-headers -Ilinux-headers $QEMU_INCLUDES"
|
QEMU_INCLUDES="-isystem ${source_path}/linux-headers -Ilinux-headers $QEMU_INCLUDES"
|
||||||
libudev="yes"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -6287,15 +6286,6 @@ if test "$libnfs" != "no" ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# Do we have libudev
|
|
||||||
if test "$libudev" != "no" ; then
|
|
||||||
if $pkg_config libudev && test "$static" != "yes"; then
|
|
||||||
libudev="yes"
|
|
||||||
libudev_libs=$($pkg_config --libs libudev)
|
|
||||||
else
|
|
||||||
libudev="no"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Exclude --warn-common with TSan to suppress warnings from the TSan libraries.
|
# Exclude --warn-common with TSan to suppress warnings from the TSan libraries.
|
||||||
if test "$solaris" = "no" && test "$tsan" = "no"; then
|
if test "$solaris" = "no" && test "$tsan" = "no"; then
|
||||||
|
@ -7456,10 +7446,6 @@ if test "$gcov" = "yes" ; then
|
||||||
echo "CONFIG_GCOV=y" >> $config_host_mak
|
echo "CONFIG_GCOV=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$libudev" != "no"; then
|
|
||||||
echo "CONFIG_LIBUDEV=y" >> $config_host_mak
|
|
||||||
echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$fuzzing" != "no"; then
|
if test "$fuzzing" != "no"; then
|
||||||
echo "CONFIG_FUZZ=y" >> $config_host_mak
|
echo "CONFIG_FUZZ=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -257,8 +257,8 @@ if 'CONFIG_CURL' in config_host
|
||||||
link_args: config_host['CURL_LIBS'].split())
|
link_args: config_host['CURL_LIBS'].split())
|
||||||
endif
|
endif
|
||||||
libudev = not_found
|
libudev = not_found
|
||||||
if 'CONFIG_LIBUDEV' in config_host
|
if targetos == 'linux' and (have_system or have_tools)
|
||||||
libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
|
libudev = dependency('libudev', static: enable_static)
|
||||||
endif
|
endif
|
||||||
brlapi = not_found
|
brlapi = not_found
|
||||||
if 'CONFIG_BRLAPI' in config_host
|
if 'CONFIG_BRLAPI' in config_host
|
||||||
|
@ -440,6 +440,7 @@ has_gettid = cc.has_function('gettid')
|
||||||
|
|
||||||
# Create config-host.h
|
# Create config-host.h
|
||||||
|
|
||||||
|
config_host_data.set('CONFIG_LIBUDEV', libudev.found())
|
||||||
config_host_data.set('CONFIG_SDL', sdl.found())
|
config_host_data.set('CONFIG_SDL', sdl.found())
|
||||||
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
|
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
|
||||||
config_host_data.set('CONFIG_VNC', vnc.found())
|
config_host_data.set('CONFIG_VNC', vnc.found())
|
||||||
|
@ -1450,7 +1451,7 @@ summary_info += {'sheepdog support': config_host.has_key('CONFIG_SHEEPDOG')}
|
||||||
summary_info += {'capstone': config_host.has_key('CONFIG_CAPSTONE')}
|
summary_info += {'capstone': config_host.has_key('CONFIG_CAPSTONE')}
|
||||||
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': config_host.has_key('CONFIG_LIBUDEV')}
|
summary_info += {'libudev': libudev.found()}
|
||||||
summary_info += {'default devices': config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'}
|
summary_info += {'default devices': config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'}
|
||||||
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')}
|
||||||
|
|
Loading…
Reference in a new issue