From 2238f11d1a4e3c344fc840cb88096de44b47b43e Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Nov 2013 21:11:27 +0000 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ tool/rbinstall.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb5fd0f4cf..762faab7c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Nov 9 06:11:14 2013 vo.x (Vit Ondruch) + + * 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 * 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