merge revision(s) 44469: [Backport ruby#9329]

nurse · nurse · commit 2ae49e78e723 · 2014-02-21T14:14:26.000Z
* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions backward compatibility. [ruby-core:59426] [Bug ruby#9329] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 21 23:10:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@yahoo.co.jp>
 
 	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
@@ -2508,6 +2508,8 @@ def MAIN_DOES_NOTHING(*refs)
   $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
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Fri Feb 21 23:10:12 2014  Nobuyoshi Nakada  <[email protected]>
++
 +	* 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 <[email protected]>
 	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c