diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-08 21:11:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-08 21:11:27 +0000 |
| commit | 2238f11d1a4e3c344fc840cb88096de44b47b43e (patch) | |
| tree | e45556f275e8ae59efabaca32ce0fb5a484dffe7 | |
| parent | 213b0d78ebb9554bb890e5eed4443574a6dd3ed1 (diff) | |
rbinstall.rb: make stable files in .gemspec
* 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/trunk@43587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Sat Nov 9 06:11:14 2013 vo.x (Vit Ondruch) <vondruch@redhat.com> + + * 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]. + Sat Nov 9 01:59:18 2013 Aman Gupta <ruby@tmm1.net> * ext/objspace/object_tracing.c: Add experimental methods to diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 6eba734871..0ede5dcc0c 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -599,7 +599,7 @@ module RbInstall end def collect - ruby_libraries + built_libraries + (ruby_libraries + built_libraries).sort end private |