diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-16 00:26:09 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-16 00:26:09 +0000 |
| commit | 4ec9395ba2921ac9e5f2b900648b8e1879b4fa7a (patch) | |
| tree | 4ffe9c4baa506b4f74aedc3061f710b707d17439 | |
| parent | 4f05bf852b2ccfd11dd6be7db9c54160711953ee (diff) | |
merge revision(s) 32730:
* configure.in (enable_pthread): use -pthread on OpenBSD without
explicit option. patched by Jeremy Evans. [ruby-core:38572]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Feb 16 09:25:52 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in (enable_pthread): use -pthread on OpenBSD without + explicit option. patched by Jeremy Evans. [ruby-core:38572] + Thu Feb 16 07:34:34 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * cont.c (rb_fiber_reset_root_local_storage): add a new function to diff --git a/configure.in b/configure.in index c5acd71582..d645aa781a 100644 --- a/configure.in +++ b/configure.in @@ -1829,7 +1829,9 @@ if test x"$enable_pthread" = xyes; then [c], [], [root], [], [c_r], [MAINLIBS="-pthread $MAINLIBS"], - [LIBS="-l$pthread_lib $LIBS"]) + [AS_CASE(["$target_os"], + [openbsd*], [LIBS="-pthread $LIBS"], + [LIBS="-l$pthread_lib $LIBS"])]) else AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled") fi @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 123 +#define RUBY_PATCHLEVEL 124 #define RUBY_RELEASE_DATE "2012-02-16" #define RUBY_RELEASE_YEAR 2012 |