naruse	2014-02-21 23:14:26 +0900 (Fri, 21 Feb 2014)

  New Revision: 45082

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45082

  Log:
    merge revision(s) 44469: [Backport #9329]
    
    * lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
      backward compatibility.  [ruby-core:59426] [Bug #9329]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/mkmf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45081)
+++ ruby_2_1/ChangeLog	(revision 45082)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Feb 21 23:10:12 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
+	  backward compatibility.  [ruby-core:59426] [Bug #9329]
+
 Fri Feb 21 23:07:56 2014  Akio Tajima <artonx@y...>
 
 	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
Index: ruby_2_1/lib/mkmf.rb
===================================================================
--- ruby_2_1/lib/mkmf.rb	(revision 45081)
+++ ruby_2_1/lib/mkmf.rb	(revision 45082)
@@ -2508,6 +2508,8 @@ MESSAGE https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/mkmf.rb#L2508
   $configure_args["--topdir"] ||= $curdir
   $ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
 
+  RbConfig.expand(CONFIG["RUBY_SO_NAME"])
+
   # :startdoc:
 
   split = Shellwords.method(:shellwords).to_proc
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45081)
+++ ruby_2_1/version.h	(revision 45082)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-21"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44469


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