kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Split thread-model config into another ac file

Browse source 
This is a first step to allow the thread-model implementation to be
switched by configure's option
This commit is contained in:
Yuta Saito 2021-10-28 15:48:45 +09:00 • committed by Yusuke Endoh
parent 6c812c6f4e
commit ccda26efe7
Notes: git 2021-10-30 10:18:53 +09:00
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -37,6 +37,7 @@ m4_include([tool/m4/ruby_replace_type.m4])dnl
m4_include([tool/m4/ruby_rm_recursive.m4])dnl m4_include([tool/m4/ruby_rm_recursive.m4])dnl
m4_include([tool/m4/ruby_setjmp_type.m4])dnl m4_include([tool/m4/ruby_setjmp_type.m4])dnl
m4_include([tool/m4/ruby_stack_grow_direction.m4])dnl m4_include([tool/m4/ruby_stack_grow_direction.m4])dnl
m4_include([tool/m4/ruby_thread.m4])dnl
m4_include([tool/m4/ruby_try_cflags.m4])dnl m4_include([tool/m4/ruby_try_cflags.m4])dnl
m4_include([tool/m4/ruby_try_cxxflags.m4])dnl m4_include([tool/m4/ruby_try_cxxflags.m4])dnl
m4_include([tool/m4/ruby_try_ldflags.m4])dnl m4_include([tool/m4/ruby_try_ldflags.m4])dnl
@ -3697,9 +3698,6 @@ AC_ARG_ENABLE(install-static-library,
[INSTALL_STATIC_LIBRARY=yes])) [INSTALL_STATIC_LIBRARY=yes]))
AC_SUBST(INSTALL_STATIC_LIBRARY) AC_SUBST(INSTALL_STATIC_LIBRARY)
AS_IF([test "$rb_with_pthread" = "yes"], [
THREAD_MODEL=pthread
])
AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [ AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern void conftest_external(void) {}]], [[]])],[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern void conftest_external(void) {}]], [[]])],[
rb_cv_symbol_prefix=`$NM conftest.$ac_objext | rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
@ -3773,7 +3771,6 @@ AS_CASE(["$target_os"],
COMMON_LIBS=m COMMON_LIBS=m
# COMMON_MACROS="WIN32_LEAN_AND_MEAN=" # COMMON_MACROS="WIN32_LEAN_AND_MEAN="
COMMON_HEADERS="winsock2.h windows.h" COMMON_HEADERS="winsock2.h windows.h"
THREAD_MODEL=win32
PLATFORM_DIR=win32 PLATFORM_DIR=win32
]) ])
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
@ -3795,11 +3792,7 @@ AS_CASE(["$target_os"],
MINIOBJS="$MINIDLNOBJ" MINIOBJS="$MINIDLNOBJ"
AS_CASE(["$THREAD_MODEL"], RUBY_THREAD
[pthread], [AC_CHECK_HEADERS(pthread.h)],
[win32], [],
[""], [AC_MSG_ERROR(thread model is missing)],
[AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
AC_ARG_ENABLE(debug-env, AC_ARG_ENABLE(debug-env,
AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]), AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),

19
tool/m4/ruby_thread.m4 Normal file
View file

@ -0,0 +1,19 @@
dnl -*- Autoconf -*-
AC_DEFUN([RUBY_THREAD], [
AS_CASE(["$target_os"],
[mingw*], [
THREAD_MODEL=win32
],
[
AS_IF([test "$rb_with_pthread" = "yes"], [
THREAD_MODEL=pthread
])
]
)
AS_CASE(["$THREAD_MODEL"],
[pthread], [AC_CHECK_HEADERS(pthread.h)],
[win32], [],
[""], [AC_MSG_ERROR(thread model is missing)],
[AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
])dnl