kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ext_conf_builder.rb: build in the source directory

Browse source 
* 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
This commit is contained in:
nobu 2013-03-02 16:14:32 +00:00
parent ee01561bf1
commit c0c72c9ba1
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Sun Mar 3 00:04:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile): * enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):

21
lib/rubygems/ext/ext_conf_builder.rb
View file

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