diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-12 12:33:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-12 12:33:43 +0200 |
| commit | 9202162c5c069c925b6b9bf84e546fbd362cdf46 (patch) | |
| tree | 7e6c64a6b068ba888c14fdde4ca595fdd058c56d | |
| parent | 9b69f22e66d51d764e9ade87ae8a57ac13ab7348 (diff) | |
| download | vim-9202162c5c069c925b6b9bf84e546fbd362cdf46.zip | |
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)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.ac | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index 947860f16..4ee62b371 100755 --- 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 76714b1e7..f4650962b 100644 --- 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 25df81c1e..6302ad27e 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1185, +/**/ 1184, /**/ 1183, |