From: Jordan Williams Date: Thu, 6 Oct 2022 13:56:36 +0000 (-0500) Subject: Check for more symbols before defining HAVE_CLOCK_MONOTONIC in Meson X-Git-Tag: dbus-1.15.4~40^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20b379e502c02d49f62fc25f8dbcc36cfe95ab2;p=thirdparty%2Fdbus.git Check for more symbols before defining HAVE_CLOCK_MONOTONIC in Meson MacOS has limited support for monotonic clock in its pthread implementation. When building with Meson, `HAVE_MONOTONIC_CLOCK` is defined despite this. This PR checks for the existence of the missing function `pthread_condattr_setclock`. To match parity with AutoTools, it also checks for `clock_getres`. Fixes #419. --- diff --git a/meson.build b/meson.build index 3b5b182c1..20e9dbc6d 100644 --- a/meson.build +++ b/meson.build @@ -328,7 +328,9 @@ data_config.set('top_builddir', meson.project_build_root()) threads = dependency('threads') config.set( 'HAVE_MONOTONIC_CLOCK', - cc.has_header_symbol('pthread.h', 'CLOCK_MONOTONIC', args: compile_args_c), + cc.has_header_symbol('pthread.h', 'CLOCK_MONOTONIC', args: compile_args_c) + and cc.has_header_symbol('pthread.h', 'pthread_condattr_setclock', args: compile_args_c) + and cc.has_header_symbol('time.h', 'clock_getres', args: compile_args_c), ) glib = dependency(