Skip to content

Commit

Permalink
patch 8.2.2241: Build with Ruby and clang may fail
Browse files Browse the repository at this point in the history
Problem:    Build with Ruby and clang may fail.
Solution:   Adjust congigure and sed script. (Ozaki Kiichi, closes #7566)
  • Loading branch information
brammool committed Dec 28, 2020
1 parent 41a834d commit 864a28b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ci/config.mk.clang.sed
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/^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 changes: 3 additions & 0 deletions src/auto/configure
Original file line number Diff line number Diff line change
Expand Up @@ -7651,6 +7651,9 @@ $as_echo "$rubyhdrdir" >&6; }
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
RUBY_LIBS=
fi
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
$as_echo "not found; disabling Ruby" >&6; }
Expand Down
3 changes: 3 additions & 0 deletions src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2001,6 +2001,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
RUBY_LIBS=
fi
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
fi
else
AC_MSG_RESULT(not found; disabling Ruby)
fi
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2241,
/**/
2240,
/**/
Expand Down

0 comments on commit 864a28b

Please sign in to comment.