From 7b60ab093bc204baf0fa2c5ba9024204650247c0 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 12 Jan 2014 07:08:02 +0000 Subject: merge revision(s) 43587: [Backport #8623] * tool/rbinstall.rb (Gem::Specification#collect): make stable Gem::Specification.files in default .gemspecs the different order of "files" in .gemspec files makes them different therefore possibly conflicting in multilib scenario. patch by vo.x (Vit Ondruch) at [ruby-core:57544] [Bug #8623]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/rbinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 5162498ecd..d463c18595 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -604,7 +604,7 @@ module RbInstall end def collect - ruby_libraries + built_libraries + (ruby_libraries + built_libraries).sort end private -- cgit v1.2.3