frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <sys/evenfd.h> check as well.

This is preparation work for the following commits, no functional change
intended at this point.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642>
This commit is contained in:
Olivier Fourdan 2024-08-13 10:18:38 +02:00 committed by Marge Bot
parent fbc034e847
commit 673b56e61c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -505,6 +505,12 @@ else
build_dri2 = get_option('dri2') == 'true' build_dri2 = get_option('dri2') == 'true'
endif 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') have_eventfd = cc.has_header('sys/eventfd.h')
if get_option('dri3') == 'auto' if get_option('dri3') == 'auto'
build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found() and have_eventfd build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found() and have_eventfd

6
present/meson.build
View File

@ -16,12 +16,6 @@ hdrs_present = [
'presentext.h', 'presentext.h',
] ]
if host_machine.system() in ['freebsd', 'openbsd']
epoll_dep = dependency('epoll-shim')
else
epoll_dep = []
endif
libxserver_present = static_library('libxserver_present', libxserver_present = static_library('libxserver_present',
srcs_present, srcs_present,
include_directories: inc, include_directories: inc,