build: Link to libpthread, if pthread_atfork() needs to be used

On non-glibc systems (e.g., FreeBSD), pthread_atfork() stub is
provided as a nop and our fork detection mechanism doesn't work.  Pull
in the actual implementation from libpthread in that case.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

diff --git a/NEWS b/NEWS
index ab8ff57e14af78a54861f2e2a88c1c3a42bb5d0e..616face0edb2c5eaf8e41fcb8e7bab672e94fc89 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
  * server: Enable socket activation through systemd [PR#173]
  * rpc-server: p11_kit_remote_serve_tokens: Allow exporting all modules [PR#174]
  * proxy: Fail early if there is no slot mapping [PR#175]
- * Remove hard dependency on libpthread [PR#177]
+ * Remove hard dependency on libpthread on glibc systems [PR#177]
  * Build fixes [PR#170, PR#176]
 
 0.23.12 (stable)

diff --git a/common/library.c b/common/library.c
index b72465ba587a10c7969fc702d66f803df9d44610..73a008c43246eca5ba4a369f1ebc3e86a8f21694 100644 (file)
--- a/common/library.c
+++ b/common/library.c
@@ -145,12 +145,14 @@ extern int __register_atfork (void (*prepare) (void), void (*parent) (void),
 
 #ifdef HAVE___REGISTER_ATFORK
 
-#define p11_register_atfork(a,b,c,d) \
-       (__register_atfork((a),(b),(c),(d)))
+extern void *__dso_handle;
+
+#define p11_register_atfork(a,b,c) \
+       (__register_atfork((a),(b),(c),__dso_handle))
 
 #else
 
-#define p11_register_atfork(a,b,c,d) \
+#define p11_register_atfork(a,b,c) \
        (pthread_atfork((a),(b),(c)))
 
 #endif /* HAVE___REGISTER_ATFORK */
@@ -177,7 +179,7 @@ p11_library_init_impl (void)
        p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0);
 #endif
 
-       p11_register_atfork (NULL, NULL, count_forks, NULL);
+       p11_register_atfork (NULL, NULL, count_forks);
 }
 
 void

diff --git a/configure.ac b/configure.ac
index 93a6c83f6e64d0894582c1c2f80ce981b0d3194b..dde0ea22fbb3c59e38453f393b763377f59b2e4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,12 @@ if test "$os_unix" = "yes"; then
        AC_CHECK_FUNCS([setenv])
        AC_CHECK_FUNCS([getpeereid])
        AC_CHECK_FUNCS([getpeerucred])
-       AC_CHECK_FUNCS([__register_atfork])
+       # If __register_atfork() is not available, we have to link to
+       # libpthread so that the non-stub version of pthread_atfork() work
+       # FIXME: replace pthread_atfork() uses with manual PID checks
+       AC_CHECK_FUNCS([__register_atfork], , [
+               AC_CHECK_LIB([pthread], [pthread_atfork])
+       ])
        AC_CHECK_DECLS([__register_atfork])
 
        # Check if issetugid() is available and has compatible behavior with OpenBSD