diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-07-20 13:22:14 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-08-10 10:11:24 +0200 |
| commit | dc4a6eaddbb36a344cc6a9c7eb12cab9df4899b0 (patch) | |
| tree | 37ca2ca3a9e82b788ca4f98d541c66d501f843cd | |
| parent | f04c2a84ad2a017a778fa2f23719318acb9ca89f (diff) | |
build: Explicitly link threaded test programs to libpthread
Some test programs use pthread_create(), which glibc doesn't provide
the stub. Link those programs with -lpthread.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | p11-kit/Makefile.am | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c9877d8..b35da75 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,16 @@ if test "$os_unix" = "yes"; then ]) ]) + SAVE_LIBS="$LIBS" + PTHREAD_LIBS= + AC_CHECK_FUNC([pthread_create], , [ + AC_CHECK_LIB([pthread], [pthread_create], + [PTHREAD_LIBS=-lpthread], + [AC_MSG_ERROR([could not find pthread_create])]) + ]) + LIBS="$SAVE_LIBS" + AC_SUBST(PTHREAD_LIBS) + AC_CHECK_FUNC([nanosleep], , [ AC_SEARCH_LIBS([nanosleep], [rt], , [ AC_MSG_ERROR([could not find nanosleep]) diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index b6dffde..2ceeb7b 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -335,10 +335,10 @@ test_conf_SOURCES = p11-kit/test-conf.c test_conf_LDADD = $(p11_kit_LIBS) test_deprecated_SOURCES = p11-kit/test-deprecated.c -test_deprecated_LDADD = $(p11_kit_LIBS) +test_deprecated_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS) test_init_SOURCES = p11-kit/test-init.c -test_init_LDADD = $(p11_kit_LIBS) +test_init_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS) test_iter_SOURCES = p11-kit/test-iter.c test_iter_LDADD = $(p11_kit_LIBS) @@ -356,7 +356,7 @@ test_proxy_SOURCES = p11-kit/test-proxy.c test_proxy_LDADD = $(p11_kit_LIBS) test_rpc_SOURCES = p11-kit/test-rpc.c -test_rpc_LDADD = $(p11_kit_LIBS) +test_rpc_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS) test_server_SOURCES = p11-kit/test-server.c test_server_LDADD = $(p11_kit_LIBS) @@ -397,7 +397,7 @@ test_managed_SOURCES = p11-kit/test-managed.c test_managed_LDADD = $(p11_kit_LIBS) test_transport_SOURCES = p11-kit/test-transport.c -test_transport_LDADD = $(p11_kit_LIBS) +test_transport_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS) test_virtual_SOURCES = p11-kit/test-virtual.c test_virtual_LDADD = $(p11_kit_LIBS) |