Skip to content

Fix build on musl libc #280

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

Draft
CameronNemo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix build on musl libc #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/Services/Calendar/Store.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ public class Calendar.Store : Object {
}

private Store () {
#if HAVE_NL_TIME_FIRST_WEEKDAY
int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
#else
int week_start = 1;
#endif
if (week_start >= 1 && week_start <= 7) {
week_starts_on = (GLib.DateWeekday) (week_start - 1);
}
Expand Down
12 changes: 11 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,17 @@ else
add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala')
endif

m_dep = meson.get_compiler('c').find_library('m', required : false)
cc = meson.get_compiler('c')
m_dep = cc.find_library('m', required : false)
libnotify_dep = dependency('libnotify', required: false)

if libnotify_dep.found()
add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
endif

if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
endif

gresource_calendar = gnome.compile_resources(
'gresource_calendar',
Expand Down