ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: simplify logic for -Dfdt 

fdt_opt == 'disabled' is going to give an error if libfdt is required
by any target, so catch that immediately.  For fdt_opt == 'enabled',
instead, do not check immediately whether the internal libfdt is present.
Instead do the check after ascertaining that libfdt is absent or too old.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-18 17:29:04 +02:00
parent 0bfd14149b
commit 577bdbcf85
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meson.build
View File

@ -3059,13 +3059,14 @@ if have_system and vfio_user_server_allowed
endif endif
fdt = not_found fdt = not_found
if have_system fdt_opt = get_option('fdt')
fdt_opt = get_option('fdt') if fdt_required.length() > 0 or fdt_opt == 'enabled'
if fdt_opt == 'disabled'
error('fdt disabled but required by targets ' + ', '.join(fdt_required))
endif
if fdt_opt in ['enabled', 'auto', 'system'] if fdt_opt in ['enabled', 'auto', 'system']
have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt') fdt = cc.find_library('fdt', required: fdt_opt == 'system')
fdt = cc.find_library('fdt',
required: fdt_opt == 'system' or
fdt_opt == 'enabled' and not have_internal)
if fdt.found() and cc.links(''' if fdt.found() and cc.links('''
#include <libfdt.h> #include <libfdt.h>
#include <libfdt_env.h> #include <libfdt_env.h>
@ -3074,14 +3075,19 @@ if have_system
fdt_opt = 'system' fdt_opt = 'system'
elif fdt_opt == 'system' elif fdt_opt == 'system'
error('system libfdt requested, but it is too old (1.5.1 or newer required)') error('system libfdt requested, but it is too old (1.5.1 or newer required)')
elif have_internal
fdt_opt = 'internal'
else else
fdt_opt = 'disabled' fdt_opt = 'internal'
fdt = not_found fdt = not_found
endif endif
endif endif
if fdt_opt == 'internal' if not fdt.found()
assert(fdt_opt == 'internal')
have_internal = fs.exists(meson.current_source_dir() / 'subprojects/dtc/meson.build')
if not have_internal
error('libfdt source not found - please pull git submodule')
endif
fdt_files = files( fdt_files = files(
'dtc/libfdt/fdt.c', 'dtc/libfdt/fdt.c',
'dtc/libfdt/fdt_ro.c', 'dtc/libfdt/fdt_ro.c',
@ -3106,9 +3112,6 @@ if have_system
else else
fdt_opt = 'disabled' fdt_opt = 'disabled'
endif endif
if not fdt.found() and fdt_required.length() > 0
error('fdt not available but required by targets ' + ', '.join(fdt_required))
endif
config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_CAPSTONE', capstone.found())
config_host_data.set('CONFIG_FDT', fdt.found()) config_host_data.set('CONFIG_FDT', fdt.found())