archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
	  backward compatibility.  [ruby-core:59426] [Bug #9329]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-21 14:14:26 +00:00
parent 7463add18f
commit 562f916fbd
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 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 * win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c

2
lib/mkmf.rb
View file

@ -2508,6 +2508,8 @@ MESSAGE
$configure_args["--topdir"] ||= $curdir $configure_args["--topdir"] ||= $curdir
$ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"])) $ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
RbConfig.expand(CONFIG["RUBY_SO_NAME"])
# :startdoc: # :startdoc:
split = Shellwords.method(:shellwords).to_proc split = Shellwords.method(:shellwords).to_proc

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1" #define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-21" #define RUBY_RELEASE_DATE "2014-02-21"
#define RUBY_PATCHLEVEL 45 #define RUBY_PATCHLEVEL 46
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2