Mercurial > vim
changeset 12614:12f4408c7f69 v8.0.1185
patch 8.0.1185: Ruby library includes minor version number
commit https://github.com/vim/vim/commit/9202162c5c069c925b6b9bf84e546fbd362cdf46
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 12 12:33:43 2017 +0200
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 https://github.com/vim/vim/issues/2199)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 12 Oct 2017 12:45:07 +0200 |
parents | d9deffab15dc |
children | 962b8ecbd793 |
files | src/auto/configure src/configure.ac src/version.c |
diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5722,7 +5722,7 @@ fi -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 @@ fi $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
--- a/src/configure.ac +++ b/src/configure.ac @@ -1902,9 +1902,9 @@ if test "$enable_rubyinterp" = "yes" -o 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