mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 02:44:53 +00:00
configure, meson: move CONFIG_HOST_DSOSUF to Meson
This is just a constant string, there is no need to pass it in config-host.mak. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20211007130829.632254-5-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
9c29b74100
commit
a630508112
6
configure
vendored
6
configure
vendored
|
@ -351,7 +351,6 @@ bigendian="no"
|
||||||
mingw32="no"
|
mingw32="no"
|
||||||
gcov="no"
|
gcov="no"
|
||||||
EXESUF=""
|
EXESUF=""
|
||||||
HOST_DSOSUF=".so"
|
|
||||||
modules="no"
|
modules="no"
|
||||||
module_upgrades="no"
|
module_upgrades="no"
|
||||||
prefix="/usr/local"
|
prefix="/usr/local"
|
||||||
|
@ -594,9 +593,6 @@ fi
|
||||||
# cross-compiling to one of these OSes then you'll need to specify
|
# cross-compiling to one of these OSes then you'll need to specify
|
||||||
# the correct CPU with the --cpu option.
|
# the correct CPU with the --cpu option.
|
||||||
case $targetos in
|
case $targetos in
|
||||||
Darwin)
|
|
||||||
HOST_DSOSUF=".dylib"
|
|
||||||
;;
|
|
||||||
SunOS)
|
SunOS)
|
||||||
# $(uname -m) returns i86pc even on an x86_64 box, so default based on isainfo
|
# $(uname -m) returns i86pc even on an x86_64 box, so default based on isainfo
|
||||||
if test -z "$cpu" && test "$(isainfo -k)" = "amd64"; then
|
if test -z "$cpu" && test "$(isainfo -k)" = "amd64"; then
|
||||||
|
@ -785,7 +781,6 @@ fi
|
||||||
|
|
||||||
if test "$mingw32" = "yes" ; then
|
if test "$mingw32" = "yes" ; then
|
||||||
EXESUF=".exe"
|
EXESUF=".exe"
|
||||||
HOST_DSOSUF=".dll"
|
|
||||||
# MinGW needs -mthreads for TLS and macro _MT.
|
# MinGW needs -mthreads for TLS and macro _MT.
|
||||||
CONFIGURE_CFLAGS="-mthreads $CONFIGURE_CFLAGS"
|
CONFIGURE_CFLAGS="-mthreads $CONFIGURE_CFLAGS"
|
||||||
write_c_skeleton;
|
write_c_skeleton;
|
||||||
|
@ -4638,7 +4633,6 @@ echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
|
||||||
echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
|
echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
|
||||||
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
|
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
|
||||||
echo "EXESUF=$EXESUF" >> $config_host_mak
|
echo "EXESUF=$EXESUF" >> $config_host_mak
|
||||||
echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
|
|
||||||
echo "LIBS_QGA=$libs_qga" >> $config_host_mak
|
echo "LIBS_QGA=$libs_qga" >> $config_host_mak
|
||||||
if test "$gcov" = "yes" ; then
|
if test "$gcov" = "yes" ; then
|
||||||
echo "CONFIG_GCOV=y" >> $config_host_mak
|
echo "CONFIG_GCOV=y" >> $config_host_mak
|
||||||
|
|
10
meson.build
10
meson.build
|
@ -250,6 +250,7 @@ iokit = []
|
||||||
emulator_link_args = []
|
emulator_link_args = []
|
||||||
nvmm =not_found
|
nvmm =not_found
|
||||||
hvf = not_found
|
hvf = not_found
|
||||||
|
host_dsosuf = '.so'
|
||||||
if targetos == 'windows'
|
if targetos == 'windows'
|
||||||
socket = cc.find_library('ws2_32')
|
socket = cc.find_library('ws2_32')
|
||||||
winmm = cc.find_library('winmm')
|
winmm = cc.find_library('winmm')
|
||||||
|
@ -258,9 +259,11 @@ if targetos == 'windows'
|
||||||
version_res = win.compile_resources('version.rc',
|
version_res = win.compile_resources('version.rc',
|
||||||
depend_files: files('pc-bios/qemu-nsis.ico'),
|
depend_files: files('pc-bios/qemu-nsis.ico'),
|
||||||
include_directories: include_directories('.'))
|
include_directories: include_directories('.'))
|
||||||
|
host_dsosuf = '.dll'
|
||||||
elif targetos == 'darwin'
|
elif targetos == 'darwin'
|
||||||
coref = dependency('appleframeworks', modules: 'CoreFoundation')
|
coref = dependency('appleframeworks', modules: 'CoreFoundation')
|
||||||
iokit = dependency('appleframeworks', modules: 'IOKit', required: false)
|
iokit = dependency('appleframeworks', modules: 'IOKit', required: false)
|
||||||
|
host_dsosuf = '.dylib'
|
||||||
elif targetos == 'sunos'
|
elif targetos == 'sunos'
|
||||||
socket = [cc.find_library('socket'),
|
socket = [cc.find_library('socket'),
|
||||||
cc.find_library('nsl'),
|
cc.find_library('nsl'),
|
||||||
|
@ -1458,6 +1461,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0]
|
||||||
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
|
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
|
||||||
config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2])
|
config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2])
|
||||||
|
|
||||||
|
config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
|
||||||
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
|
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
|
||||||
|
|
||||||
# has_header
|
# has_header
|
||||||
|
@ -1603,10 +1607,9 @@ config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
|
||||||
return printf("%zu", SIZE_MAX);
|
return printf("%zu", SIZE_MAX);
|
||||||
}''', args: ['-Werror']))
|
}''', args: ['-Werror']))
|
||||||
|
|
||||||
|
|
||||||
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
|
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
|
||||||
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
|
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
|
||||||
strings = ['HOST_DSOSUF', 'CONFIG_IASL']
|
strings = ['CONFIG_IASL']
|
||||||
foreach k, v: config_host
|
foreach k, v: config_host
|
||||||
if ignored.contains(k)
|
if ignored.contains(k)
|
||||||
# do nothing
|
# do nothing
|
||||||
|
@ -1618,9 +1621,6 @@ foreach k, v: config_host
|
||||||
elif k == 'ARCH'
|
elif k == 'ARCH'
|
||||||
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)
|
||||||
if not k.startswith('CONFIG_')
|
|
||||||
k = 'CONFIG_' + k.to_upper()
|
|
||||||
endif
|
|
||||||
config_host_data.set_quoted(k, v)
|
config_host_data.set_quoted(k, v)
|
||||||
elif k.startswith('CONFIG_') or k.startswith('HAVE_') or k.startswith('HOST_')
|
elif k.startswith('CONFIG_') or k.startswith('HAVE_') or k.startswith('HOST_')
|
||||||
config_host_data.set(k, v == 'y' ? 1 : v)
|
config_host_data.set(k, v == 'y' ? 1 : v)
|
||||||
|
|
Loading…
Reference in a new issue