patch 8.0.1185: Ruby library includes minor version number

Problem:    Ruby library includes minor version number.
Solution:   Only use the API version number. (Ben Boeckel, closes #2199)

diff --git a/src/auto/configure b/src/auto/configure
index 947860f1688fddf25b353076fba98b9cd0d59959..4ee62b371778402912b2e15351e04ee631330de3 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5722,7 +5722,7 @@ $as_echo "OK" >&6; }
                -e 's/-fdebug-prefix-map[^ ]*//g' \
                -e 's/-pipe //' \
                -e 's/-W[^ ]*//g' \
-                -e 's/-D_FORTIFY_SOURCE=.//g'`
+               -e 's/-D_FORTIFY_SOURCE=.//g'`
             perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
                sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
                        -e 's/-bE:perl.exp//' -e 's/-lc //'`
@@ -7200,10 +7200,10 @@ $as_echo "$rubyhdrdir" >&6; }
        $as_echo "#define FEAT_RUBY 1" >>confdefs.h
 
        if test "$enable_rubyinterp" = "dynamic"; then
-         libruby=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"`
+         libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_ALIASES'].split[0]"`
          $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
-         RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
+         RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
          RUBY_LIBS=
        fi
       else

diff --git a/src/configure.ac b/src/configure.ac
index 76714b1e7bab64a21f10b157e8035dd2eda4db40..f4650962bbe6c4406ecc092d82125679c72ddbe8 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1902,9 +1902,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
        RUBY_PRO="if_ruby.pro"
        AC_DEFINE(FEAT_RUBY)
        if test "$enable_rubyinterp" = "dynamic"; then
-         libruby=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_SO']]"`
+         libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_ALIASES']].split[[0]]"`
          AC_DEFINE(DYNAMIC_RUBY)
-         RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
+         RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
          RUBY_LIBS=
        fi
       else

diff --git a/src/version.c b/src/version.c
index 25df81c1e757a3002feebe5918f1396043cdbe1d..6302ad27e9b1eb2a38b511a7d9c6a67c1a2183b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1185,
 /**/
     1184,
 /**/