Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unbreak build on FreeBSD #324

Merged
merged 3 commits into from
Dec 26, 2020
Merged

Unbreak build on FreeBSD #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7435a67
eventloop: bump POSIX for monotonic clock and close-on-exec
jbeich Dec 21, 2020
d3eb07b
build: require epoll-shim on BSDs
jbeich Dec 21, 2020
4c59b5c
ci: add FreeBSD job
jbeich Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions .builds/freebsd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
image: freebsd/latest
packages:
- basu
emersion marked this conversation as resolved.
Show resolved Hide resolved
- gdk-pixbuf2
- libepoll-shim
- meson
- pango
- pkgconf
- scdoc
- wayland
- wayland-protocols
sources:
- https://github.com/emersion/mako
tasks:
- setup: |
cd mako
meson build/ -Dauto_features=enabled -Dsd-bus-provider=basu -Dsystemd=disabled
- build: |
cd mako
ninja -C build/
2 changes: 1 addition & 1 deletion event-loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <errno.h>
#include <stdio.h>
Expand Down
7 changes: 7 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ realtime = cc.find_library('rt')
wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.14')

epoll = dependency('', required: false)
if (not cc.has_function('timerfd_create', prefix: '#include <sys/timerfd.h>') or
not cc.has_function('signalfd', prefix: '#include <sys/signalfd.h>'))
epoll = dependency('epoll-shim')
endif

if get_option('sd-bus-provider') == 'auto'
assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto')
sdbus = dependency('libsystemd',
Expand Down Expand Up @@ -91,6 +97,7 @@ executable(
dependencies: [
cairo,
client_protos,
epoll,
gdk_pixbuf,
sdbus,
pango,
Expand Down