usa	2016-12-27 19:30:35 +0900 (Tue, 27 Dec 2016)

  New Revision: 57212

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57212

  Log:
    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.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 57211)
+++ ruby_2_2/ChangeLog	(revision 57212)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Dec 27 19:29:54 2016  Akinori MUSHA  <knu@i...>
+
+	* configure.in: reverse compatibility_version and current_version for
+	  Darwin.
+
 Tue Dec 27 19:10:09 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* marshal.c (dump_funcall, dump_check_funcall, load_funcall):
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 57211)
+++ ruby_2_2/configure.in	(revision 57212)
@@ -3544,8 +3544,8 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L3544
 	    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_*'
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57211)
+++ ruby_2_2/version.h	(revision 57212)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56905


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