diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-04 15:13:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-04 15:13:34 +0200 |
| commit | 87ea64ca965ca00b3e72776c39355964293f2ace (patch) | |
| tree | f7db063faf76b4fc348b569107b60057ff758a4a | |
| parent | 82593c1a3a2c5e39603ed76819f83b1197c06c8b (diff) | |
patch 8.1.0237: Ruby on Cygwin doesn't always workv8.1.0237
Problem: Ruby on Cygwin doesn't always work.
Solution: Use LIBRUBY_SO if LIBRUBY_ALIASES isn't set. (Ken Takata)
| -rwxr-xr-x | src/auto/configure | 3 | ||||
| -rw-r--r-- | src/configure.ac | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index de1fd6059c..0ab7e23020 100755 --- 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 0d8ea32d34..8994f3c90a 100644 --- 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 ec097fd6a7..de3a32e5ed 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 237, +/**/ 236, /**/ 235, |