configure, meson: move remaining HAVE_* compiler tests to Meson
Remove some special cases by moving them to Meson. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20211007130829.632254-8-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a76a1f6b76
commit
96a63aeb3d
37
configure
vendored
37
configure
vendored
@ -2403,18 +2403,6 @@ else
|
|||||||
l2tpv3=no
|
l2tpv3=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat > $TMPC <<EOF
|
|
||||||
#include <sys/mman.h>
|
|
||||||
int main(int argc, char *argv[]) {
|
|
||||||
return mlockall(MCL_FUTURE);
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
if compile_prog "" "" ; then
|
|
||||||
have_mlockall=yes
|
|
||||||
else
|
|
||||||
have_mlockall=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
#########################################
|
#########################################
|
||||||
# vhost interdependencies and host support
|
# vhost interdependencies and host support
|
||||||
|
|
||||||
@ -3842,21 +3830,6 @@ if test "$fortify_source" != "no"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
|
||||||
# check if struct fsxattr is available via linux/fs.h
|
|
||||||
|
|
||||||
have_fsxattr=no
|
|
||||||
cat > $TMPC << EOF
|
|
||||||
#include <linux/fs.h>
|
|
||||||
struct fsxattr foo;
|
|
||||||
int main(void) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
if compile_prog "" "" ; then
|
|
||||||
have_fsxattr=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# check for usable membarrier system call
|
# check for usable membarrier system call
|
||||||
if test "$membarrier" = "yes"; then
|
if test "$membarrier" = "yes"; then
|
||||||
@ -4358,13 +4331,6 @@ if test "$gdbus_codegen" != "" ; then
|
|||||||
fi
|
fi
|
||||||
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
|
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
|
||||||
|
|
||||||
# Work around a system header bug with some kernel/XFS header
|
|
||||||
# versions where they both try to define 'struct fsxattr':
|
|
||||||
# xfs headers will not try to redefine structs from linux headers
|
|
||||||
# if this macro is set.
|
|
||||||
if test "$have_fsxattr" = "yes" ; then
|
|
||||||
echo "HAVE_FSXATTR=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$xen" = "enabled" ; then
|
if test "$xen" = "enabled" ; then
|
||||||
echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
|
echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
|
||||||
echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
|
echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
|
||||||
@ -4569,9 +4535,6 @@ fi
|
|||||||
if test "$parallels" = "yes" ; then
|
if test "$parallels" = "yes" ; then
|
||||||
echo "CONFIG_PARALLELS=y" >> $config_host_mak
|
echo "CONFIG_PARALLELS=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$have_mlockall" = "yes" ; then
|
|
||||||
echo "HAVE_MLOCKALL=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$plugins" = "yes" ; then
|
if test "$plugins" = "yes" ; then
|
||||||
echo "CONFIG_PLUGIN=y" >> $config_host_mak
|
echo "CONFIG_PLUGIN=y" >> $config_host_mak
|
||||||
|
19
meson.build
19
meson.build
@ -1601,6 +1601,23 @@ config_host_data.set('CONFIG_SPLICE', cc.links(gnu_source_prefix + '''
|
|||||||
return 0;
|
return 0;
|
||||||
}'''))
|
}'''))
|
||||||
|
|
||||||
|
config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_source_prefix + '''
|
||||||
|
#include <sys/mman.h>
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
return mlockall(MCL_FUTURE);
|
||||||
|
}'''))
|
||||||
|
|
||||||
|
# Work around a system header bug with some kernel/XFS header
|
||||||
|
# versions where they both try to define 'struct fsxattr':
|
||||||
|
# xfs headers will not try to redefine structs from linux headers
|
||||||
|
# if this macro is set.
|
||||||
|
config_host_data.set('HAVE_FSXATTR', cc.links('''
|
||||||
|
#include <linux/fs.h>'
|
||||||
|
struct fsxattr foo;
|
||||||
|
int main(void) {
|
||||||
|
return 0;
|
||||||
|
}'''))
|
||||||
|
|
||||||
# Some versions of Mac OS X incorrectly define SIZE_MAX
|
# Some versions of Mac OS X incorrectly define SIZE_MAX
|
||||||
config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
|
config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@ -1625,7 +1642,7 @@ foreach k, v: config_host
|
|||||||
config_host_data.set('HOST_' + v.to_upper(), 1)
|
config_host_data.set('HOST_' + v.to_upper(), 1)
|
||||||
elif strings.contains(k)
|
elif strings.contains(k)
|
||||||
config_host_data.set_quoted(k, v)
|
config_host_data.set_quoted(k, v)
|
||||||
elif k.startswith('CONFIG_') or k.startswith('HAVE_')
|
elif k.startswith('CONFIG_')
|
||||||
config_host_data.set(k, v == 'y' ? 1 : v)
|
config_host_data.set(k, v == 'y' ? 1 : v)
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
Loading…
Reference in New Issue
Block a user