usa	2016-07-12 00:17:58 +0900 (Tue, 12 Jul 2016)

  New Revision: 55637

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55637

  Log:
    merge revision(s) 49758,50356,50359: [Backport #12563]
    
    fake.rb: rubyarchhdrdir for rubyspec
    
    * common.mk (test-rubyspec): use fake script to set header
      directories.
    
    * template/fake.rb.in (RUBYOPT): set -r option to propagate to
      forked processes.
    
    * tool/fake.rb (prehook): set rubyarchhdrdir too.
    * too/fake.rb: don't fake libdir.  use libdirname instead.
    
    * tool/fake.rb: don't fake libdir.  use libdirname instead.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/common.mk
    branches/ruby_2_2/template/fake.rb.in
    branches/ruby_2_2/tool/fake.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55636)
+++ ruby_2_2/ChangeLog	(revision 55637)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Jul 12 00:17:36 2016  NAKAMURA Usaku  <usa@r...>
+
+	* tool/fake.rb: don't fake libdir.  use libdirname instead.
+
 Thu Jul  7 00:05:00 2016  NAKAMURA Usaku  <usa@r...>
 
 	* bignum.c (Init_Bignum): revert a part of previous commit (r55598),
Index: ruby_2_2/template/fake.rb.in
===================================================================
--- ruby_2_2/template/fake.rb.in	(revision 55636)
+++ ruby_2_2/template/fake.rb.in	(revision 55637)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/template/fake.rb.in#L1
 baseruby="@BASERUBY@"
 ruby="${RUBY-$baseruby}"
+baseruby=
 "eval" "{" \
 "`expr \"$ruby\" : echo > /dev/null || echo exec`" \
 "$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \
@@ -26,3 +27,4 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/template/fake.rb.in#L27
 $:.unshift(File.expand_path(builddir))
 fake = File.join(top_srcdir, "tool/fake.rb")
 eval(File.read(fake), nil, fake)
+ENV["RUBYOPT"] = ["-r#{__FILE__}", ENV["RUBYOPT"]].compact.join(" ")
Index: ruby_2_2/common.mk
===================================================================
--- ruby_2_2/common.mk	(revision 55636)
+++ ruby_2_2/common.mk	(revision 55637)
@@ -584,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb https://github.com/ruby/ruby/blob/trunk/ruby_2_2/common.mk#L584
 
 test-rubyspec-precheck:
 
-test-rubyspec: test-rubyspec-precheck
-	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55636)
+++ ruby_2_2/version.h	(revision 55637)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
-#define RUBY_RELEASE_DATE "2016-07-11"
-#define RUBY_PATCHLEVEL 343
+#define RUBY_RELEASE_DATE "2016-07-12"
+#define RUBY_PATCHLEVEL 344
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 
Index: ruby_2_2/tool/fake.rb
===================================================================
--- ruby_2_2/tool/fake.rb	(revision 55636)
+++ ruby_2_2/tool/fake.rb	(revision 55637)
@@ -20,9 +20,11 @@ prehook = proc do |extmk| https://github.com/ruby/ruby/blob/trunk/ruby_2_2/tool/fake.rb#L20
     mkconfig = RbConfig::MAKEFILE_CONFIG
     mkconfig["top_srcdir"] = $top_srcdir = top_srcdir
     mkconfig["rubyhdrdir"] = "$(top_srcdir)/include"
+    mkconfig["rubyarchhdrdir"] = "$(builddir)/$(EXTOUT)/include/$(arch)"
     mkconfig["builddir"] = config["builddir"] = builddir
     config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include")
-    mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
+    config["rubyarchhdrdir"] = File.join(builddir, config["EXTOUT"], "include", config["arch"])
+    mkconfig["libdirname"] = "builddir"
     trace_var(:$ruby, posthook)
   end
   untrace_var(:$extmk, prehook)

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49758,50356,50359


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