mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
configure: convert compiler tests to meson, part 1
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
e46bd55d9c
commit
e66420ac6d
3 changed files with 43 additions and 366 deletions
364
configure
vendored
364
configure
vendored
|
|
@ -3588,297 +3588,6 @@ EOF
|
|||
fi
|
||||
fi
|
||||
|
||||
# check for fallocate
|
||||
fallocate=no
|
||||
cat > $TMPC << EOF
|
||||
#include <fcntl.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
fallocate(0, 0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
fallocate=yes
|
||||
fi
|
||||
|
||||
# check for fallocate hole punching
|
||||
fallocate_punch_hole=no
|
||||
cat > $TMPC << EOF
|
||||
#include <fcntl.h>
|
||||
#include <linux/falloc.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
fallocate(0, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
fallocate_punch_hole=yes
|
||||
fi
|
||||
|
||||
# check that fallocate supports range zeroing inside the file
|
||||
fallocate_zero_range=no
|
||||
cat > $TMPC << EOF
|
||||
#include <fcntl.h>
|
||||
#include <linux/falloc.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
fallocate(0, FALLOC_FL_ZERO_RANGE, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
fallocate_zero_range=yes
|
||||
fi
|
||||
|
||||
# check for posix_fallocate
|
||||
posix_fallocate=no
|
||||
cat > $TMPC << EOF
|
||||
#include <fcntl.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
posix_fallocate(0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
posix_fallocate=yes
|
||||
fi
|
||||
|
||||
# check for sync_file_range
|
||||
sync_file_range=no
|
||||
cat > $TMPC << EOF
|
||||
#include <fcntl.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
sync_file_range(0, 0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
sync_file_range=yes
|
||||
fi
|
||||
|
||||
# check for linux/fiemap.h and FS_IOC_FIEMAP
|
||||
fiemap=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/fiemap.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
ioctl(0, FS_IOC_FIEMAP, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
fiemap=yes
|
||||
fi
|
||||
|
||||
# check for dup3
|
||||
dup3=no
|
||||
cat > $TMPC << EOF
|
||||
#include <unistd.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
dup3(0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
dup3=yes
|
||||
fi
|
||||
|
||||
# check for ppoll support
|
||||
ppoll=no
|
||||
cat > $TMPC << EOF
|
||||
#include <poll.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
struct pollfd pfd = { .fd = 0, .events = 0, .revents = 0 };
|
||||
ppoll(&pfd, 1, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
ppoll=yes
|
||||
fi
|
||||
|
||||
# check for prctl(PR_SET_TIMERSLACK , ... ) support
|
||||
prctl_pr_set_timerslack=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/prctl.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
prctl(PR_SET_TIMERSLACK, 1, 0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
prctl_pr_set_timerslack=yes
|
||||
fi
|
||||
|
||||
# check for epoll support
|
||||
epoll=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/epoll.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
epoll_create(0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
epoll=yes
|
||||
fi
|
||||
|
||||
# epoll_create1 is a later addition
|
||||
# so we must check separately for its presence
|
||||
epoll_create1=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/epoll.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
/* Note that we use epoll_create1 as a value, not as
|
||||
* a function being called. This is necessary so that on
|
||||
* old SPARC glibc versions where the function was present in
|
||||
* the library but not declared in the header file we will
|
||||
* fail the configure check. (Otherwise we will get a compiler
|
||||
* warning but not an error, and will proceed to fail the
|
||||
* qemu compile where we compile with -Werror.)
|
||||
*/
|
||||
return (int)(uintptr_t)&epoll_create1;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
epoll_create1=yes
|
||||
fi
|
||||
|
||||
# check for sendfile support
|
||||
sendfile=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/sendfile.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
return sendfile(0, 0, 0, 0);
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
sendfile=yes
|
||||
fi
|
||||
|
||||
# check for timerfd support (glibc 2.8 and newer)
|
||||
timerfd=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/timerfd.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
return(timerfd_create(CLOCK_REALTIME, 0));
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
timerfd=yes
|
||||
fi
|
||||
|
||||
# check for setns and unshare support
|
||||
setns=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sched.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
int ret;
|
||||
ret = setns(0, 0);
|
||||
ret = unshare(0);
|
||||
return ret;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
setns=yes
|
||||
fi
|
||||
|
||||
# clock_adjtime probe
|
||||
clock_adjtime=no
|
||||
cat > $TMPC <<EOF
|
||||
#include <time.h>
|
||||
#include <sys/timex.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
return clock_adjtime(0, 0);
|
||||
}
|
||||
EOF
|
||||
clock_adjtime=no
|
||||
if compile_prog "" "" ; then
|
||||
clock_adjtime=yes
|
||||
fi
|
||||
|
||||
# syncfs probe
|
||||
syncfs=no
|
||||
cat > $TMPC <<EOF
|
||||
#include <unistd.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
return syncfs(0);
|
||||
}
|
||||
EOF
|
||||
syncfs=no
|
||||
if compile_prog "" "" ; then
|
||||
syncfs=yes
|
||||
fi
|
||||
|
||||
# Search for bswap_32 function
|
||||
byteswap_h=no
|
||||
cat > $TMPC << EOF
|
||||
#include <byteswap.h>
|
||||
int main(void) { return bswap_32(0); }
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
byteswap_h=yes
|
||||
fi
|
||||
|
||||
# Search for bswap32 function
|
||||
bswap_h=no
|
||||
cat > $TMPC << EOF
|
||||
#include <sys/endian.h>
|
||||
#include <sys/types.h>
|
||||
#include <machine/bswap.h>
|
||||
int main(void) { return bswap32(0); }
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
bswap_h=yes
|
||||
fi
|
||||
|
||||
# Check whether we have openpty() in either libc or libutil
|
||||
cat > $TMPC << EOF
|
||||
extern int openpty(int *am, int *as, char *name, void *termp, void *winp);
|
||||
int main(void) { return openpty(0, 0, 0, 0, 0); }
|
||||
EOF
|
||||
|
||||
have_openpty="no"
|
||||
if compile_prog "" "" ; then
|
||||
have_openpty="yes"
|
||||
else
|
||||
if compile_prog "" "-lutil" ; then
|
||||
have_openpty="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# spice probe
|
||||
if test "$spice_protocol" != "no" ; then
|
||||
|
|
@ -4114,19 +3823,6 @@ if compile_prog "" "" ; then
|
|||
st_atim=yes
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# check if we have sigev_notify_thread_id
|
||||
|
||||
sigev_notify_thread_id=no
|
||||
cat > $TMPC << EOF
|
||||
#include <stddef.h>
|
||||
#include <signal.h>
|
||||
int main(void) { return offsetof(struct sigevent, sigev_notify_thread_id); }
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
sigev_notify_thread_id=yes
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# check if trace backend exists
|
||||
|
||||
|
|
@ -5265,54 +4961,6 @@ fi
|
|||
if test "$have_usbfs" = "yes" ; then
|
||||
echo "CONFIG_USBFS=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$fallocate" = "yes" ; then
|
||||
echo "CONFIG_FALLOCATE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$fallocate_punch_hole" = "yes" ; then
|
||||
echo "CONFIG_FALLOCATE_PUNCH_HOLE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$fallocate_zero_range" = "yes" ; then
|
||||
echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$posix_fallocate" = "yes" ; then
|
||||
echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$sync_file_range" = "yes" ; then
|
||||
echo "CONFIG_SYNC_FILE_RANGE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$fiemap" = "yes" ; then
|
||||
echo "CONFIG_FIEMAP=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$dup3" = "yes" ; then
|
||||
echo "CONFIG_DUP3=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$ppoll" = "yes" ; then
|
||||
echo "CONFIG_PPOLL=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$prctl_pr_set_timerslack" = "yes" ; then
|
||||
echo "CONFIG_PRCTL_PR_SET_TIMERSLACK=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$epoll" = "yes" ; then
|
||||
echo "CONFIG_EPOLL=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$epoll_create1" = "yes" ; then
|
||||
echo "CONFIG_EPOLL_CREATE1=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$sendfile" = "yes" ; then
|
||||
echo "CONFIG_SENDFILE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$timerfd" = "yes" ; then
|
||||
echo "CONFIG_TIMERFD=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$setns" = "yes" ; then
|
||||
echo "CONFIG_SETNS=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$clock_adjtime" = "yes" ; then
|
||||
echo "CONFIG_CLOCK_ADJTIME=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$syncfs" = "yes" ; then
|
||||
echo "CONFIG_SYNCFS=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$inotify" = "yes" ; then
|
||||
echo "CONFIG_INOTIFY=y" >> $config_host_mak
|
||||
fi
|
||||
|
|
@ -5328,15 +4976,6 @@ fi
|
|||
if test "$st_atim" = "yes" ; then
|
||||
echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$sigev_notify_thread_id" = "yes" ; then
|
||||
echo "HAVE_SIGEV_NOTIFY_THREAD_ID=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$byteswap_h" = "yes" ; then
|
||||
echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$bswap_h" = "yes" ; then
|
||||
echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$gio" = "yes" ; then
|
||||
echo "CONFIG_GIO=y" >> $config_host_mak
|
||||
echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
|
||||
|
|
@ -5346,9 +4985,6 @@ if test "$gdbus_codegen" != "" ; then
|
|||
echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
|
||||
fi
|
||||
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
|
||||
if test "$have_openpty" = "yes" ; then
|
||||
echo "HAVE_OPENPTY=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
# Work around a system header bug with some kernel/XFS header
|
||||
# versions where they both try to define 'struct fsxattr':
|
||||
|
|
|
|||
41
meson.build
41
meson.build
|
|
@ -1051,10 +1051,12 @@ endif
|
|||
|
||||
# Check whether the glibc provides statx()
|
||||
|
||||
statx_test = '''
|
||||
gnu_source_prefix = '''
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
'''
|
||||
statx_test = gnu_source_prefix + '''
|
||||
#include <sys/stat.h>
|
||||
int main(void) {
|
||||
struct statx statxbuf;
|
||||
|
|
@ -1257,6 +1259,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
|
|||
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
|
||||
|
||||
# has_header
|
||||
config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))
|
||||
config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.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'))
|
||||
|
|
@ -1265,9 +1268,45 @@ 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'))
|
||||
|
||||
# has_function
|
||||
config_host_data.set('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime'))
|
||||
config_host_data.set('CONFIG_DUP3', cc.has_function('dup3'))
|
||||
config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate'))
|
||||
config_host_data.set('CONFIG_POSIX_FALLOCATE', cc.has_function('posix_fallocate'))
|
||||
config_host_data.set('CONFIG_PPOLL', cc.has_function('ppoll'))
|
||||
config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>'))
|
||||
config_host_data.set('CONFIG_SENDFILE', cc.has_function('sendfile'))
|
||||
config_host_data.set('CONFIG_SETNS', cc.has_function('setns') and cc.has_function('unshare'))
|
||||
config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs'))
|
||||
config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_range'))
|
||||
config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create'))
|
||||
config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util))
|
||||
config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
|
||||
|
||||
# has_header_symbol
|
||||
config_host_data.set('CONFIG_BYTESWAP_H',
|
||||
cc.has_header_symbol('byteswap.h', 'bswap_32'))
|
||||
config_host_data.set('CONFIG_EPOLL_CREATE1',
|
||||
cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
|
||||
config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',
|
||||
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUNCH_HOLE') and
|
||||
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEEP_SIZE'))
|
||||
config_host_data.set('CONFIG_FALLOCATE_ZERO_RANGE',
|
||||
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_ZERO_RANGE'))
|
||||
config_host_data.set('CONFIG_FIEMAP',
|
||||
cc.has_header('linux/fiemap.h') and
|
||||
cc.has_header_symbol('linux/fs.h', 'FS_IOC_FIEMAP'))
|
||||
config_host_data.set('CONFIG_MACHINE_BSWAP_H',
|
||||
cc.has_header_symbol('machine/bswap.h', 'bswap32',
|
||||
prefix: '''#include <sys/endian.h>
|
||||
#include <sys/types.h>'''))
|
||||
config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK',
|
||||
cc.has_header_symbol('sys/prctl.h', 'PR_SET_TIMERSLACK'))
|
||||
|
||||
# has_member
|
||||
config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
|
||||
cc.has_member('struct sigevent', 'sigev_notify_thread_id',
|
||||
prefix: '#include <signal.h>'))
|
||||
|
||||
# Some versions of Mac OS X incorrectly define SIZE_MAX
|
||||
config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
|
||||
#include <stdint.h>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@ util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c'))
|
|||
util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c'))
|
||||
util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c'))
|
||||
util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c'))
|
||||
util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c'))
|
||||
if config_host_data.get('CONFIG_EPOLL_CREATE1')
|
||||
util_ss.add(files('fdmon-epoll.c'))
|
||||
endif
|
||||
util_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('fdmon-io_uring.c'))
|
||||
util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c'))
|
||||
util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c'))
|
||||
|
|
|
|||
Loading…
Reference in a new issue