diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 07:08:02 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 07:08:02 +0000 |
| commit | 7b60ab093bc204baf0fa2c5ba9024204650247c0 (patch) | |
| tree | 9e7f080ab2d3c97b34d5de26ffdc9a986037abe2 /tool | |
| parent | 1b056110be0ad56107f9e2daac88d71fc7a8fb58 (diff) | |
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
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |