diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:31:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:31:59 +0000 |
| commit | 68eb3d86a1ee9b7ca6b26bb30f930ab74b1b4ce1 (patch) | |
| tree | b637726e00fb9bfb793731470e52fe96c9fa179f | |
| parent | 52301063d4e81d292cb180b7fe99db8e38304c61 (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
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 26 insertions, 7 deletions
@@ -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 diff --git a/Makefile.in b/Makefile.in index a93a1e61df..2d349e5201 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,8 +93,11 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) 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@\ @@ -120,7 +120,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --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:: 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)" diff --git a/configure.in b/configure.in index bc6855dc93..d242e01657 100644 --- a/configure.in +++ b/configure.in @@ -2600,7 +2600,8 @@ if test x"$cross_compiling" = xyes; then 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 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) AC_SUBST(MINIRUBY) AC_SUBST(BTESTRUBY) AC_SUBST(PREP) +AC_SUBST(RUNRUBY_COMMAND) AC_SUBST(RUNRUBY) AC_SUBST(XRUBY) AC_SUBST(EXTOUT, [${EXTOUT=.ext}]) @@ -1,6 +1,6 @@ #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 |