From f54265a8eb872dbccb6e071aa62c840adf39e0a2 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Jul 2016 15:17:58 +0000
Subject: [PATCH] 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 4 ++++
 common.mk           | 4 ++--
 template/fake.rb.in | 2 ++
 tool/fake.rb        | 4 +++-
 version.h           | 6 +++---
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dfb43e809..3309c66cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 12 00:17:36 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/fake.rb: don't fake libdir.  use libdirname instead.
+
 Thu Jul  7 00:05:00 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* bignum.c (Init_Bignum): revert a part of previous commit (r55598),
diff --git a/common.mk b/common.mk
index 3aa60c497a..fde7e8c688 100644
--- a/common.mk
+++ b/common.mk
@@ -584,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP
 
 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
diff --git a/template/fake.rb.in b/template/fake.rb.in
index 6f5de5092f..8e461c57a4 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -1,5 +1,6 @@
 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
 $:.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(" ")
diff --git a/tool/fake.rb b/tool/fake.rb
index 7d3a471402..f8c68173e6 100644
--- a/tool/fake.rb
+++ b/tool/fake.rb
@@ -20,9 +20,11 @@ prehook = proc do |extmk|
     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)
diff --git a/version.h b/version.h
index ced190478f..5ef670c6b1 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"