diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:30:35 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:30:35 +0000 |
| commit | e44b8733dd8ab9b147c3dfeadd61835ab2f582a2 (patch) | |
| tree | f2adc1e911933c3ce2787006d97b5be74b61526b | |
| parent | 88c68a89d3bfae15664f59355c013c0c23bd1a63 (diff) | |
merge revision(s) 56905: [Backport #12983]
Reverse compatibility_version and current_version for Darwin
The `compatibility_version` should have an API version and the
`current_version` should have a program version of Ruby, but they have
been reversed and the binary compatibility has never worked.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Dec 27 19:29:54 2016 Akinori MUSHA <knu@iDaemons.org> + + * configure.in: reverse compatibility_version and current_version for + Darwin. + Tue Dec 27 19:10:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * marshal.c (dump_funcall, dump_check_funcall, load_funcall): diff --git a/configure.in b/configure.in index 0470d5cc0a..49e1075862 100644 --- a/configure.in +++ b/configure.in @@ -3544,8 +3544,8 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_RELATIVE=yes fi LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)' - LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)' - LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(MAJOR).$(MINOR)' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(RUBY_PROGRAM_VERSION)' if test "$visibility_option" = ld; then LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*' @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2016-12-27" -#define RUBY_PATCHLEVEL 402 +#define RUBY_PATCHLEVEL 403 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 12 |