summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da3a9cc43c..fae0558719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 25 19:24:25 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * configure.in: not to use vfork on Solaris to avoid deadlock
+ occurred in vfork(2) with multi-threading and dynamic linker
+ on Solaris. [Bug #11265] [ruby-dev:49089]
+
Thu Jun 25 18:25:41 2015 Naohisa Goto <ngotogenome@gmail.com>
* test/lib/envutil.rb (Test::Unit::Assertions#assert_no_memory_leak):
diff --git a/configure.in b/configure.in
index 4640a44e6d..79b410e86f 100644
--- a/configure.in
+++ b/configure.in
@@ -1070,6 +1070,9 @@ main()
],
[hpux*], [ LIBS="-lm $LIBS"
ac_cv_c_inline=no],
+[solaris*], [ LIBS="-lm $LIBS"
+ ac_cv_func_vfork=no
+ ],
[beos*|haiku*], [
ac_cv_func_link=no
ac_cv_func_sched_yield=no