[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/26] configure: convert compiler tests to meson, part 2
From: |
Paolo Bonzini |
Subject: |
[PATCH 21/26] configure: convert compiler tests to meson, part 2 |
Date: |
Tue, 8 Jun 2021 13:22:56 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 49 -------------------------------------------------
meson.build | 4 ++++
2 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/configure b/configure
index b16c84ca74..7f7f548b1a 100755
--- a/configure
+++ b/configure
@@ -3783,46 +3783,6 @@ if compile_prog "" "" ; then
posix_syslog=yes
fi
-##########################################
-# check if we have sem_timedwait
-
-sem_timedwait=no
-cat > $TMPC << EOF
-#include <semaphore.h>
-int main(void) { sem_t s; struct timespec t = {0}; return sem_timedwait(&s,
&t); }
-EOF
-if compile_prog "" "" ; then
- sem_timedwait=yes
-fi
-
-##########################################
-# check if we have strchrnul
-
-strchrnul=no
-cat > $TMPC << EOF
-#include <string.h>
-int main(void);
-// Use a haystack that the compiler shouldn't be able to constant fold
-char *haystack = (char*)&main;
-int main(void) { return strchrnul(haystack, 'x') != &haystack[6]; }
-EOF
-if compile_prog "" "" ; then
- strchrnul=yes
-fi
-
-#########################################
-# check if we have st_atim
-
-st_atim=no
-cat > $TMPC << EOF
-#include <sys/stat.h>
-#include <stddef.h>
-int main(void) { return offsetof(struct stat, st_atim); }
-EOF
-if compile_prog "" "" ; then
- st_atim=yes
-fi
-
##########################################
# check if trace backend exists
@@ -4981,15 +4941,6 @@ fi
if test "$inotify1" = "yes" ; then
echo "CONFIG_INOTIFY1=y" >> $config_host_mak
fi
-if test "$sem_timedwait" = "yes" ; then
- echo "CONFIG_SEM_TIMEDWAIT=y" >> $config_host_mak
-fi
-if test "$strchrnul" = "yes" ; then
- echo "HAVE_STRCHRNUL=y" >> $config_host_mak
-fi
-if test "$st_atim" = "yes" ; then
- echo "HAVE_STRUCT_STAT_ST_ATIM=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
diff --git a/meson.build b/meson.build
index 0f2b05eef6..5e63a21bc1 100644
--- a/meson.build
+++ b/meson.build
@@ -1277,12 +1277,14 @@ 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_SEM_TIMEDWAIT', cc.has_function('sem_timedwait',
dependencies: threads))
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_STRCHRNUL', cc.has_function('strchrnul'))
config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix:
'#include <stdlib.h>'))
config_host_data.set('CONFIG_BYTESWAP_H',
@@ -1303,6 +1305,8 @@ config_host_data.set('CONFIG_MACHINE_BSWAP_H',
#include
<sys/types.h>'''))
config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK',
cc.has_header_symbol('sys/prctl.h', 'PR_SET_TIMERSLACK'))
+config_host_data.set('HAVE_STRUCT_STAT_ST_ATIM',
+ cc.has_member('struct stat', 'st_atim', prefix: '#include
<sys/stat.h>'))
# Some versions of Mac OS X incorrectly define SIZE_MAX
config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
--
2.31.1
- Re: [PATCH 15/26] meson: sort header tests, (continued)
[PATCH 12/26] configure, meson: convert libpmem detection to meson, Paolo Bonzini, 2021/06/08
[PATCH 20/26] meson: store dependency('threads') in a variable, Paolo Bonzini, 2021/06/08
[PATCH 17/26] configure, meson: move CONFIG_IVSHMEM to meson, Paolo Bonzini, 2021/06/08
[PATCH 21/26] configure: convert compiler tests to meson, part 2,
Paolo Bonzini <=
[PATCH 23/26] configure: convert CONFIG_STATIC_ASSERT tests to meson, Paolo Bonzini, 2021/06/08
[PATCH 22/26] configure: convert compiler tests to meson, part 3, Paolo Bonzini, 2021/06/08
[PATCH 26/26] configure: convert compiler tests to meson, part 6, Paolo Bonzini, 2021/06/08
[PATCH 25/26] configure: convert compiler tests to meson, part 5, Paolo Bonzini, 2021/06/08