From a6a2ccb4486306c3caa5ccd337d972b61b97f75a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 1 Sep 2023 12:09:24 -0700 Subject: [PATCH] meson: fix intel requirements Intel requires libpciaccess and an x86/x86_64 host, so if those aren't found and it's enabled we need to error Signed-off-by: Dylan Baker Reviewed-by: Simon Ser --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 05f05fd9..ba62da6e 100644 --- a/meson.build +++ b/meson.build @@ -87,8 +87,12 @@ dep_pciaccess = dependency('pciaccess', version : '>= 0.10', required : get_opti with_intel = false _intel = get_option('intel') if not _intel.disabled() - if _intel.enabled() and not with_atomics - error('libdrm_intel requires atomics.') + if _intel.enabled() + if not with_atomics + error('libdrm_intel requires atomics.') + elif not dep_pciaccess.found() + error('libdrm_intel requires libpciaccess') + endif else with_intel = (_intel.enabled() or host_machine.cpu_family().startswith('x86')) and with_atomics and dep_pciaccess.found() endif