adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.1185: Ruby library includes minor version number

Browse Source 
Problem:    Ruby library includes minor version number.
Solution:   Only use the API version number. (Ben Boeckel, closes #2199)
This commit is contained in:
Bram Moolenaar
2017-10-12 12:33:43 +02:00
parent 9b69f22e66
commit 9202162c5c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auto/configure vendored
View File

@ -5722,7 +5722,7 @@ $as_echo "OK" >&6; }
-e 's/-fdebug-prefix-map[^ ]*//g' \ -e 's/-fdebug-prefix-map[^ ]*//g' \
-e 's/-pipe //' \ -e 's/-pipe //' \
-e 's/-W[^ ]*//g' \ -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' | \ perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
sed -e '/Warning/d' -e '/Note (probably harmless)/d' \ sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
-e 's/-bE:perl.exp//' -e 's/-lc //'` -e 's/-bE:perl.exp//' -e 's/-lc //'`
@ -7200,10 +7200,10 @@ $as_echo "$rubyhdrdir" >&6; }
$as_echo "#define FEAT_RUBY 1" >>confdefs.h $as_echo "#define FEAT_RUBY 1" >>confdefs.h
if test "$enable_rubyinterp" = "dynamic"; then 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 $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= RUBY_LIBS=
fi fi
else else

4
src/configure.ac
View File

@ -1902,9 +1902,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
RUBY_PRO="if_ruby.pro" RUBY_PRO="if_ruby.pro"
AC_DEFINE(FEAT_RUBY) AC_DEFINE(FEAT_RUBY)
if test "$enable_rubyinterp" = "dynamic"; then 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) 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= RUBY_LIBS=
fi fi
else else

2
src/version.c
View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1185,
/**/ /**/
1184, 1184,
/**/ /**/