PHPC-759: Fix pthread linking for static builds

Author: jmikola

config.m4

@@ -349,6 +349,11 @@ if test "$PHP_MONGODB" != "no"; then
   PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(mongodb)[/src/MongoDB/Monitoring/])
   PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(mongodb)[/src/contrib/])
 
+  dnl Necessary to ensure that static builds include "-pthread" when linking
+  if test "$ext_shared" != "yes"; then
+    EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $EXTRA_LDFLAGS"
+  fi
+
   dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
   PHP_ADD_MAKEFILE_FRAGMENT
 

scripts/build/autotools/libbson/FindDependencies.m4

@@ -79,8 +79,12 @@ AC_CHECK_FUNC(rand_r, [AC_SUBST(BSON_HAVE_RAND_R, 1)], [], [#include <stdlib.h>]
 # but I actually think it is okay to just check for it even though we will
 # use win32 primatives.
 AX_PTHREAD([
-  PHP_EVAL_INCLINE([$PTHREAD_CFLAGS])
+  PHP_MONGODB_BSON_CFLAGS="$PHP_MONGODB_BSON_CFLAGS $PTHREAD_CFLAGS"
   PHP_EVAL_LIBLINE([$PTHREAD_LIBS],[MONGODB_SHARED_LIBADD])
+
+  # PTHREAD_CFLAGS may come back as "-pthread", which should also be used when
+  # linking. We can trust PHP_EVAL_LIBLINE to ignore other values.
+  PHP_EVAL_LIBLINE([$PTHREAD_CFLAGS],[MONGODB_SHARED_LIBADD])
 ],[
   AC_MSG_ERROR([libbson requires pthreads on non-Windows platforms.])
 ])

scripts/build/autotools/libmongoc/FindDependencies.m4

@@ -23,5 +23,16 @@ AC_CHECK_TYPE([socklen_t],
               [AC_SUBST(MONGOC_HAVE_SOCKLEN, 0)],
               [#include <sys/socket.h>])
 
-dnl libbson already requires pthreads, so skip a redundant, optional check here
-dnl AX_PTHREAD
+# Check for pthreads. libmongoc's original FindDependencies.m4 script did not
+# require pthreads, but it does appear to be necessary on non-Windows platforms
+# based on mongoc-openssl.c and mongoc-thread-private.h.
+AX_PTHREAD([
+  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PTHREAD_CFLAGS"
+  PHP_EVAL_LIBLINE([$PTHREAD_LIBS],[MONGODB_SHARED_LIBADD])
+
+  # PTHREAD_CFLAGS may come back as "-pthread", which should also be used when
+  # linking. We can trust PHP_EVAL_LIBLINE to ignore other values.
+  PHP_EVAL_LIBLINE([$PTHREAD_CFLAGS],[MONGODB_SHARED_LIBADD])
+],[
+  AC_MSG_ERROR([libmongoc requires pthreads on non-Windows platforms.])
+])