diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:11:52 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:11:52 +0000 |
commit | cd1d342286e496b353cf9bc2858af2f70a3c8767 (patch) | |
tree | 500339da709bcfb9c3d52a54e1f350bd5ad60145 | |
parent | cae2f1eb8bb5663210734c201e70b458e1146f39 (diff) |
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
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,17 @@ +Mon Mar 18 00:11:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> + + * 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@segment7.net> * 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'" @@ -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 |