summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-16 19:19:36 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-16 19:19:36 +0000
commite9ab3c7ccae115d623339f0382289d66a8621ec9 (patch)
treed2c69a7fc91fa6776c598b503c59bc24ade1064e
parentdb4eec7249f8e557cf613e267f4d3455d4da3267 (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_3@57345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--configure.in4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 29b63c2401..7369730de4 100644
--- a/configure.in
+++ b/configure.in
@@ -3745,8 +3745,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_PROGRAM_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,_ruby_static_id_*'
diff --git a/version.h b/version.h
index 0fe41cfceb..14d3b7d285 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-01-17"
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 1