From c7d2247e35bc095a0e1fb7dcca9af36d71f9408c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 25 Apr 2022 18:48:37 +0900 Subject: Honor --with-thread option to enable pthread --- tool/m4/ruby_thread.m4 | 51 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) (limited to 'tool/m4') diff --git a/tool/m4/ruby_thread.m4 b/tool/m4/ruby_thread.m4 index 2e58eddb98..439c63bc22 100644 --- a/tool/m4/ruby_thread.m4 +++ b/tool/m4/ruby_thread.m4 @@ -5,6 +5,21 @@ AC_ARG_WITH(thread, [THREAD_MODEL=$withval], [ THREAD_MODEL= AS_CASE(["$target_os"], + [freebsd*], [ + AC_CACHE_CHECK([whether pthread should be enabled by default], + rb_cv_enable_pthread_default, + [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ +@%:@include +@%:@if __FreeBSD_version < 502102 +@%:@error pthread should be disabled on this platform +@%:@endif + ]])], + rb_cv_enable_pthread_default=yes, + rb_cv_enable_pthread_default=no)]) + AS_IF([test $rb_cv_enable_pthread_default = yes], + [THREAD_MODEL=pthread], + [THREAD_MODEL=none]) + ], [mingw*], [ THREAD_MODEL=win32 ], @@ -12,19 +27,47 @@ AC_ARG_WITH(thread, THREAD_MODEL=none ], [ - AS_IF([test "$rb_with_pthread" = "yes"], [ - THREAD_MODEL=pthread - ]) + THREAD_MODEL=pthread ] ) ]) +AS_IF([test x"$THREAD_MODEL" = xpthread], [ + AC_CHECK_HEADERS(pthread.h) + AS_IF([test x"$ac_cv_header_pthread_h" = xyes], [], [ + AC_MSG_WARN("Don't know how to find pthread header on your system -- thread support disabled") + THREAD_MODEL=none + ]) +]) +AS_IF([test x"$THREAD_MODEL" = xpthread], [ + THREAD_MODEL=none + for pthread_lib in thr pthread pthreads c c_r root; do + AC_CHECK_LIB($pthread_lib, pthread_create, + [THREAD_MODEL=pthread; break]) + done + AS_IF([test x"$THREAD_MODEL" = xpthread], [ + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) + AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include ]) + AS_CASE(["$pthread_lib:$target_os"], + [c:*], [], + [root:*], [], + [c_r:*|*:openbsd*|*:mirbsd*], [LIBS="-pthread $LIBS"], + [LIBS="-l$pthread_lib $LIBS"]) + ], [ + AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled") + ]) +]) + AS_CASE(["$THREAD_MODEL"], -[pthread], [AC_CHECK_HEADERS(pthread.h)], +[pthread], [], [win32], [], [none], [], [""], [AC_MSG_ERROR(thread model is missing)], [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)]) +AC_MSG_CHECKING(thread model) +AC_MSG_RESULT($THREAD_MODEL) THREAD_IMPL_H=thread_$THREAD_MODEL.h AS_IF([test ! -f "$srcdir/$THREAD_IMPL_H"], -- cgit v1.2.3