usa	2018-01-31 19:52:30 +0900 (Wed, 31 Jan 2018)

  New Revision: 62124

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62124

  Log:
    merge revision(s) 55265: [Backport #14182]
    * lib/mkmf.rb (create_makefile): sort lists of source and object
      files in generated Makefile, unless given by extconf.rb.
      [Fix GH-1367]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/mkmf.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62123)
+++ ruby_2_3/ChangeLog	(revision 62124)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Jan 31 19:49:44 2018  Reiner Herrmann  <reiner@r...>
+
+	* lib/mkmf.rb (create_makefile): sort lists of source and object
+	  files in generated Makefile, unless given by extconf.rb.
+	  [Fix GH-1367]
+
 Fri Dec 15 03:48:55 2017  NAKAMURA Usaku  <usa@r...>
 
 	* version.h: Bump version to 2.3.7
Index: ruby_2_3/lib/mkmf.rb
===================================================================
--- ruby_2_3/lib/mkmf.rb	(revision 62123)
+++ ruby_2_3/lib/mkmf.rb	(revision 62124)
@@ -2200,11 +2200,15 @@ RULES https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/mkmf.rb#L2200
     RbConfig.expand(srcdir = srcprefix.dup)
 
     ext = ".#{$OBJEXT}"
-    orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+    orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].sort
     if not $objs
       srcs = $srcs || orig_srcs
-      objs = srcs.inject(Hash.new {[]}) {|h, f| h[File.basename(f, ".*") << ext] <<= f; h}
-      $objs = objs.keys
+      $objs = []
+      objs = srcs.inject(Hash.new {[]}) {|h, f|
+        h.key?(o = File.basename(f, ".*") << ext) or $objs << o
+        h[o] <<= f
+        h
+      }
       unless objs.delete_if {|b, f| f.size == 1}.empty?
         dups = objs.sort.map {|b, f|
           "#{b[/.*\./]}{#{f.collect {|n| n[/([^.]+)\z/]}.join(',')}}"
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62123)
+++ ruby_2_3/version.h	(revision 62124)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
-#define RUBY_RELEASE_DATE "2017-12-15"
-#define RUBY_PATCHLEVEL 385
+#define RUBY_RELEASE_DATE "2018-01-31"
+#define RUBY_PATCHLEVEL 386
 
-#define RUBY_RELEASE_YEAR 2017
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_YEAR 2018
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62123)
+++ ruby_2_3	(revision 62124)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r55265

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/