summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xtool/rbinstall.rb2
2 files changed, 9 insertions, 1 deletions
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) <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