From 279cb5d17c1166c34d5df696b2f4b79f92ddc531 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 13 Aug 2024 10:18:38 +0200 Subject: [PATCH] build: Move epoll dependency check DragonFly and OpenBSD rely on epoll-shim to provide eventfd. Move the check for epoll dependency to the root meson.build script so that we can use that for the check as well. This is preparation work for the following commits, no functional change intended at this point. Signed-off-by: Olivier Fourdan Part-of: --- meson.build | 6 ++++++ present/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 06cb25a7f..c2f5525bf 100644 --- a/meson.build +++ b/meson.build @@ -490,6 +490,12 @@ else build_dri2 = get_option('dri2') == 'true' endif +if host_machine.system() in ['freebsd', 'openbsd'] + epoll_dep = dependency('epoll-shim') +else + epoll_dep = [] +endif + have_eventfd = cc.has_header('sys/eventfd.h') if get_option('dri3') == 'auto' build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found() and have_eventfd diff --git a/present/meson.build b/present/meson.build index 4073163ed..df8d40b02 100644 --- a/present/meson.build +++ b/present/meson.build @@ -15,12 +15,6 @@ hdrs_present = [ 'present.h', ] -if host_machine.system() in ['freebsd', 'openbsd'] - epoll_dep = dependency('epoll-shim') -else - epoll_dep = [] -endif - libxserver_present = static_library('libxserver_present', srcs_present, include_directories: inc,