bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] timer-time: port better to OpenBSD 6.9


From: Paul Eggert
Subject: [PATCH] timer-time: port better to OpenBSD 6.9
Date: Sat, 2 Oct 2021 17:53:23 -0700

* m4/timer_time.m4 (gl_TIMER_TIME): Also require timer_settime to
be declared, as it exists in OpenBSD but always fails with ENOSYS.
---
 ChangeLog        |  4 ++++
 m4/timer_time.m4 | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9bae3c4a3..232d2dec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2021-10-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+       timer-time: port better to OpenBSD 6.9
+       * m4/timer_time.m4 (gl_TIMER_TIME): Also require timer_settime to
+       be declared, as it exists in OpenBSD but always fails with ENOSYS.
+
        sys_select: port better to OpenBSD 6.9
        OpenBSD 6.9’s <sys/time.h> includes <sys/select.h> which then
        includes <signal.h>, which caused coreutils/lib/nproc.c compiles
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4
index f0e5785e9..003e36e9d 100644
--- a/m4/timer_time.m4
+++ b/m4/timer_time.m4
@@ -1,4 +1,4 @@
-# timer_time.m4 serial 4
+# timer_time.m4 serial 5
 dnl Copyright (C) 2011-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18,9 +18,13 @@ AC_DEFUN([gl_TIMER_TIME],
   dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/.
   m4_ifdef([gl_][PTHREADLIB], [AC_REQUIRE([gl_][PTHREADLIB])])
 
+  AC_CHECK_DECL([timer_settime], [], [],
+                [[#include <time.h>
+                ]])
   LIB_TIMER_TIME=
   AC_SUBST([LIB_TIMER_TIME])
-  gl_saved_libs=$LIBS
+  AS_IF([test "$ac_cv_have_decl_timer_settime" = yes], [
+    gl_saved_libs=$LIBS
     AC_SEARCH_LIBS([timer_settime], [rt posix4],
                    [test "$ac_cv_search_timer_settime" = "none required" ||
                     LIB_TIMER_TIME=$ac_cv_search_timer_settime])
@@ -40,5 +44,6 @@ AC_DEFUN([gl_TIMER_TIME],
          ],
          [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBPMULTITHREAD"])])
     AC_CHECK_FUNCS([timer_settime])
-  LIBS=$gl_saved_libs
+    LIBS=$gl_saved_libs
+  ])
 ])
-- 
2.30.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]