nagachika	2013-03-18 00:11:52 +0900 (Mon, 18 Mar 2013)

  New Revision: 39801

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

  Log:
    merge revision(s) 39696: [Backport #7991]
    
    * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
      it is impossible to predict which file will be installed to where,
      by the arguments, so use intermediate destination directory always.
      [Bug #7698]
    
    * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
      it is impossible to predict which file will be installed to where,
      by the arguments, so use intermediate destination directory always.
      [Bug #7698]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39800)
+++ ruby_2_0_0/ChangeLog	(revision 39801)
@@ -1,3 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 18 00:11:33 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  it is impossible to predict which file will be installed to where,
+	  by the arguments, so use intermediate destination directory always.
+	  [Bug #7698]
+
+Mon Mar 18 00:11:33 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  it is impossible to predict which file will be installed to where,
+	  by the arguments, so use intermediate destination directory always.
+	  [Bug #7698]
+
 Mon Mar 18 00:05:50 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems/commands/setup_command.rb:  Install .pem files.
Index: ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
===================================================================
--- ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39800)
+++ ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39801)
@@ -13,7 +13,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb#L13
   FileEntry = FileUtils::Entry_ # :nodoc:
 
   def self.build(extension, directory, dest_path, results, args=[])
-    tmp_dest = Dir.mktmpdir(".gem.", ".") if File.identical?(dest_path, ".")
+    tmp_dest = Dir.mktmpdir(".gem.", ".")
 
     Tempfile.open %w"siteconf .rb", "." do |siteconf|
       siteconf.puts "require 'rbconfig'"
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39800)
+++ ruby_2_0_0/version.h	(revision 39801)
@@ -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-03-18"
-#define RUBY_PATCHLEVEL 70
+#define RUBY_PATCHLEVEL 71
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39696


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