configure / meson: Move check for sys/kcov.h to meson.build
This check can be done in a much shorter way in meson.build. And while we're at it, rename the #define to HAVE_SYS_KCOV_H to match the other HAVE_someheader_H symbols that we already have. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20201118171052.308191-6-thuth@redhat.com> [lv: s/signal/kcov/] Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
88c78f162a
commit
4a9d5f895a
|
@ -4402,12 +4402,6 @@ if compile_prog "" "" ; then
|
||||||
syncfs=yes
|
syncfs=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check for kcov support (kernel must be 4.4+, compiled with certain options)
|
|
||||||
kcov=no
|
|
||||||
if check_include sys/kcov.h ; then
|
|
||||||
kcov=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
# check for btrfs filesystem support (kernel must be 3.9+)
|
# check for btrfs filesystem support (kernel must be 3.9+)
|
||||||
btrfs=no
|
btrfs=no
|
||||||
if check_include linux/btrfs.h ; then
|
if check_include linux/btrfs.h ; then
|
||||||
|
@ -6112,9 +6106,6 @@ fi
|
||||||
if test "$syncfs" = "yes" ; then
|
if test "$syncfs" = "yes" ; then
|
||||||
echo "CONFIG_SYNCFS=y" >> $config_host_mak
|
echo "CONFIG_SYNCFS=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$kcov" = "yes" ; then
|
|
||||||
echo "CONFIG_KCOV=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$btrfs" = "yes" ; then
|
if test "$btrfs" = "yes" ; then
|
||||||
echo "CONFIG_BTRFS=y" >> $config_host_mak
|
echo "CONFIG_BTRFS=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -715,7 +715,7 @@
|
||||||
IOCTL_IGNORE(TIOCSTOP)
|
IOCTL_IGNORE(TIOCSTOP)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_KCOV
|
#ifdef HAVE_SYS_KCOV_H
|
||||||
IOCTL(KCOV_ENABLE, 0, TYPE_NULL)
|
IOCTL(KCOV_ENABLE, 0, TYPE_NULL)
|
||||||
IOCTL(KCOV_DISABLE, 0, TYPE_NULL)
|
IOCTL(KCOV_DISABLE, 0, TYPE_NULL)
|
||||||
IOCTL(KCOV_INIT_TRACE, IOC_R, TYPE_ULONG)
|
IOCTL(KCOV_INIT_TRACE, IOC_R, TYPE_ULONG)
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
#ifdef CONFIG_SENDFILE
|
#ifdef CONFIG_SENDFILE
|
||||||
#include <sys/sendfile.h>
|
#include <sys/sendfile.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_KCOV
|
#ifdef HAVE_SYS_KCOV_H
|
||||||
#include <sys/kcov.h>
|
#include <sys/kcov.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -839,6 +839,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
|
||||||
config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
|
config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
|
||||||
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
|
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
|
||||||
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
|
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
|
||||||
|
config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h'))
|
||||||
config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
|
config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
|
||||||
|
|
||||||
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
|
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
|
||||||
|
|
Loading…
Reference in New Issue