mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-19 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

darwin: Locate libffi with cc.find_library() rather than dependency()

Browse source 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2023-01-27 15:02:01 -08:00
parent 4ee79756e0
commit 0b01986b0b
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -82,7 +82,12 @@ if get_option('libraries')
# Otherwise, assume that epoll(7) is supported natively. # Otherwise, assume that epoll(7) is supported natively.
epoll_dep = [] epoll_dep = []
endif endif
ffi_dep = dependency('libffi')
if host_machine.system() == 'darwin'
ffi_dep = cc.find_library('ffi')
else
ffi_dep = dependency('libffi')
endif
decls = [ decls = [
{ 'header': 'sys/signalfd.h', 'symbol': 'SFD_CLOEXEC' }, { 'header': 'sys/signalfd.h', 'symbol': 'SFD_CLOEXEC' },

4
src/connection.c
View file

@ -38,7 +38,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <time.h> #include <time.h>
#ifdef __APPLE__
#include <ffi/ffi.h>
#else
#include <ffi.h> #include <ffi.h>
#endif
#include "wayland-util.h" #include "wayland-util.h"
#include "wayland-private.h" #include "wayland-private.h"