patch 8.1.0237: Ruby on Cygwin doesn't always work

Problem:    Ruby on Cygwin doesn't always work.
Solution:   Use LIBRUBY_SO if LIBRUBY_ALIASES isn't set. (Ken Takata)

diff --git a/src/auto/configure b/src/auto/configure
index de1fd6059cf90fd2aa1906a4144aadbf316b0ba8..0ab7e2302057cd857139e7d9c1dc8c5d53569b05 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7606,6 +7606,9 @@ $as_echo "$rubyhdrdir" >&6; }
 
        if test "$enable_rubyinterp" = "dynamic"; then
          libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_ALIASES'].split[0]"`
+         if test -z "$libruby_soname"; then
+           libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"`
+         fi
          $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"

diff --git a/src/configure.ac b/src/configure.ac
index 0d8ea32d34340a556db0a004e6dce2b0c6335800..8994f3c90a12d86ec2367beb68af52f451508e39 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1956,6 +1956,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
        AC_DEFINE(FEAT_RUBY)
        if test "$enable_rubyinterp" = "dynamic"; then
          libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_ALIASES']].split[[0]]"`
+         if test -z "$libruby_soname"; then
+           libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_SO']]"`
+         fi
          AC_DEFINE(DYNAMIC_RUBY)
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
          RUBY_LIBS=

diff --git a/src/version.c b/src/version.c
index ec097fd6a7e70a9b29f842783008e2cf32f5f9db..de3a32e5edc4fe04fe58f86beb746b334f347f2b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    237,
 /**/
     236,
 /**/