From 274c6005999ec63a9fe31dfdaf05337cf1f71904 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: (cherry picked from commit 673b56e61c9c80d8484128827bd51b26d3120a3f) --- meson.build | 6 ++++++ present/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index a863b680c..3853c1847 100644 --- a/meson.build +++ b/meson.build @@ -505,6 +505,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 ec5d4cc6e..bc806a668 100644 --- a/present/meson.build +++ b/present/meson.build @@ -16,12 +16,6 @@ hdrs_present = [ 'presentext.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,