summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-12 14:31:59 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-12 14:31:59 +0000
commit68eb3d86a1ee9b7ca6b26bb30f930ab74b1b4ce1 (patch)
treeb637726e00fb9bfb793731470e52fe96c9fa179f /ChangeLog
parent52301063d4e81d292cb180b7fe99db8e38304c61 (diff)
merge revision(s) 42862(partially),42910,43093: [Backport #8878] [Backport #9085]
* common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't require extension libraries. The patch is from nobu (Nobuyoshi Nakada). * configure.in (RUNRUBY): append -- only after runruby.rb, not cross-compiling baseruby, so that $(RUN_OPT) can be command line options. [ruby-dev:47703] [Bug #8893] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 52e19bbd36..87f5c72d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Nov 12 23:24:35 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUNRUBY): append -- only after runruby.rb, not
+ cross-compiling baseruby, so that $(RUN_OPT) can be command line
+ options. [ruby-dev:47703] [Bug #8893]
+
+Tue Nov 12 23:24:35 2013 Masaki Matsushita <glass.saga@gmail.com>
+
+ (partially merged from r42862)
+ * common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
+ require extension libraries. The patch is from nobu
+ (Nobuyoshi Nakada).
+
Mon Nov 11 23:54:51 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/init.c (cloexec_accept): Fix a compile error on