nagachika	2013-11-12 23:31:59 +0900 (Tue, 12 Nov 2013)

  New Revision: 43654

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43654

  Log:
    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]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/Makefile.in
    branches/ruby_2_0_0/common.mk
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 43653)
+++ ruby_2_0_0/configure.in	(revision 43654)
@@ -2600,7 +2600,8 @@ if test x"$cross_compiling" = xyes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2600
   AC_SUBST(XRUBY_RUBYLIBDIR)
   AC_SUBST(XRUBY_RUBYHDRDIR)
   PREP='$(arch)-fake.rb'
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY='$(RUNRUBY_COMMAND)'
   XRUBY='$(MINIRUBY)'
   TEST_RUNNABLE=no
   CROSS_COMPILING=yes
@@ -2622,7 +2623,8 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2623
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
   MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
   PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
+  RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
+  RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
@@ -2632,6 +2634,7 @@ AC_SUBST(CROSS_COMPILING) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2634
 AC_SUBST(MINIRUBY)
 AC_SUBST(BTESTRUBY)
 AC_SUBST(PREP)
+AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
 AC_SUBST(XRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43653)
+++ ruby_2_0_0/ChangeLog	(revision 43654)
@@ -1,3 +1,16 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Nov 12 23:24:35 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@g...>
+
+	(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@f...>
 
 	* ext/socket/init.c (cloexec_accept): Fix a compile error on
Index: ruby_2_0_0/common.mk
===================================================================
--- ruby_2_0_0/common.mk	(revision 43653)
+++ ruby_2_0_0/common.mk	(revision 43654)
@@ -120,7 +120,7 @@ SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/common.mk#L120
 		--make-flags="$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
 		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY      =	$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
+INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
@@ -432,7 +432,7 @@ post-no-install-doc:: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/common.mk#L432
 
 CLEAR_INSTALLED_LIST = clear-installed-list
 
-install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
+install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY
 
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
Index: ruby_2_0_0/Makefile.in
===================================================================
--- ruby_2_0_0/Makefile.in	(revision 43653)
+++ ruby_2_0_0/Makefile.in	(revision 43654)
@@ -93,8 +93,11 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/Makefile.in#L93
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@\
 	$(MINIRUBYOPT)
-RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT)
-RUNRUBY = $(RUNRUBY_COMMAND) -- $(RUN_OPTS)
+# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
+RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
+# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
+RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
+# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
 RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
 XRUBY = @XRUBY@
 BTESTRUBY = @BTESTRUBY@\
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43653)
+++ ruby_2_0_0/version.h	(revision 43654)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-11-12"
-#define RUBY_PATCHLEVEL 346
+#define RUBY_PATCHLEVEL 347
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42862,42910,43093


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/