ext_conf_builder.rb: build in the source directory

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  revert use of temporary directory for build, to work some buggy
  extconf.rb which cannot build outside the source directory.
  [ruby-core:53056] [Bug #7698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,10 @@
+Sun Mar  3 01:14:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  revert use of temporary directory for build, to work some buggy
+	  extconf.rb which cannot build outside the source directory.
+	  [ruby-core:53056] [Bug #7698]
+
 Sun Mar  3 00:04:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):

lib/rubygems/ext/ext_conf_builder.rb

@@ -7,37 +7,30 @@
 require 'rubygems/ext/builder'
 require 'rubygems/command'
 require 'fileutils'
-require 'tmpdir'
+require 'tempfile'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
   def self.build(extension, directory, dest_path, results, args=[])
-    pwd = Dir.pwd
-    cmd = "#{Gem.ruby} -r./siteconf #{File.join pwd, File.basename(extension)}"
-    cmd << " #{args.join ' '}" unless args.empty?
-
-    Dir.mktmpdir("gem-install.") do |tmpdir|
-      Dir.chdir(tmpdir) do
-        open("siteconf.rb", "w") do |f|
+    siteconf = Tempfile.open(%w"siteconf .rb", ".") do |f|
       f.puts "require 'rbconfig'"
       f.puts "dest_path = #{dest_path.dump}"
       %w[sitearchdir sitelibdir].each do |dir|
         f.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
         f.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
       end
+      f
     end
 
-        begin
+    cmd = [Gem.ruby, "-r#{siteconf.path}", File.basename(extension), *args].join ' '
+
     run cmd, results
 
     make dest_path, results
-        ensure
-          FileUtils.mv("mkmf.log", pwd) if $! and File.exist?("mkmf.log")
-        end
-      end
-    end
 
     results
+  ensure
+    siteconf.close(true) if siteconf
   end
 
 end