diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:04:56 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:04:56 +0000 |
commit | 3195a2e89832ce955703ed411e13bfbd5aebd923 (patch) | |
tree | 1173217ebbb1f9951d82aeefae2cdeedc0d27df5 /version.h | |
parent | db8c0b0ef016e2b2df2c08c0afb67700beb5fff1 (diff) |
merge revision(s) 49007,49009,49957: [Backport #10960]
* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
a shared object eventually. [ruby-core:67128]
* ext/fiddle/extconf.rb: needs --enable-shared when linked to
libruby or fiddle.so. since --with-static-linked-ext does no
longer link extensions to ruby program with --enable-shared, the
only combination needs --enable-static is --disable-shared and
--with-static-linked-ext. [ruby-dev:48901] [Bug #10960]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.2" -#define RUBY_RELEASE_DATE "2015-03-25" -#define RUBY_PATCHLEVEL 88 +#define RUBY_RELEASE_DATE "2015-04-12" +#define RUBY_PATCHLEVEL 89 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |