archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 39542,39545: [Backport #7991]

Browse source 
* lib/rubygems/ext/builder.rb:  Fix incompatibilities when installing
	  extensions.  Patch by Nobu.
	  [ruby-trunk - Bug #7968] [ruby-trunk - Bug #7971]

	* lib/rubygems/ext/ext_conf_builder.rb:  ditto.

	* lib/rubygems/installer.rb:  ditto.

	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.

	* test/rubygems/test_gem_installer.rb:  ditto.

	* lib/rubygems/commands/sources_command.rb:  Prefer HTTPS over HTTP.

	* lib/rubygems/defaults.rb:  ditto

	* lib/rubygems/dependency_resolver.rb:  Ditto.

	* lib/rubygems/source.rb:  ditto.

	* lib/rubygems/spec_fetcher.rb:  ditto.

	* lib/rubygems/specification.rb:  ditto.

	* lib/rubygems/test_utilities.rb:  ditto.

	* test/rubygems/test_gem.rb:  Test for the above.

	* test/rubygems/test_gem_commands_sources_command.rb:  ditto.

	* test/rubygems/test_gem_dependency_resolver_api_set.rb:  ditto.

	* test/rubygems/test_gem_remote_fetcher.rb:  ditto.

	* test/rubygems/test_gem_source.rb:  ditto.

	* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
	  [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-17 14:18:23 +00:00
parent 91e371802f
commit 1ec03bfcfe
20 changed files with 301 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/rubygems/ext/builder.rb
View file

@ -16,13 +16,6 @@ class Gem::Ext::Builder
raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
end
mf = Gem.read_binary 'Makefile'
mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
mf = mf.gsub(/\s*\S+\.time$/, "")
File.open('Makefile', 'wb') {|f| f.print mf}
# try to find make program from Ruby configure arguments first
RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
make_program = $1 || ENV['MAKE'] || ENV['make']