From cd1d342286e496b353cf9bc2858af2f70a3c8767 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 17 Mar 2013 15:11:52 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 14 ++++++++++++++ lib/rubygems/ext/ext_conf_builder.rb | 2 +- version.h | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c85e00befb..b215969b4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Mon Mar 18 00:11:33 2013 Nobuyoshi Nakada + + * 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 + + * 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 * lib/rubygems/commands/setup_command.rb: Install .pem files. diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 39d772326a..a172afa7db 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -13,7 +13,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder 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'" diff --git a/version.h b/version.h index 2adabc8fa5..148dc2955e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3