aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2241: Build with Ruby and clang may fail

Browse Source 
Problem:    Build with Ruby and clang may fail.
Solution:   Adjust congigure and sed script. (Ozaki Kiichi, closes #7566)
This commit is contained in:
Bram Moolenaar 2020-12-28 21:36:56 +01:00
parent 41a834d1e3
commit 864a28b6a6
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/config.mk.clang.sed
View File

@ -1,2 +1,2 @@
/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/ /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes -fms-extensions/ /^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/

3
src/auto/configure vendored
View File

@ -7651,6 +7651,9 @@ $as_echo "$rubyhdrdir" >&6; }
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
RUBY_LIBS= RUBY_LIBS=
fi fi
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
$as_echo "not found; disabling Ruby" >&6; } $as_echo "not found; disabling Ruby" >&6; }

3
src/configure.ac
View File

@ -2001,6 +2001,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
RUBY_LIBS= RUBY_LIBS=
fi fi
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
fi
else else
AC_MSG_RESULT(not found; disabling Ruby) AC_MSG_RESULT(not found; disabling Ruby)
fi fi

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
2241,
/**/ /**/
2240, 2240,
/**/ /**/