Skip to content

Commit 864a28b

Browse files
committed
patch 8.2.2241: Build with Ruby and clang may fail
Problem: Build with Ruby and clang may fail. Solution: Adjust congigure and sed script. (Ozaki Kiichi, closes #7566)
1 parent 41a834d commit 864a28b

4 files changed

Lines changed: 9 additions & 1 deletion

File tree

ci/config.mk.clang.sed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
2-
/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes -fms-extensions/
2+
/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/

src/auto/configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7651,6 +7651,9 @@ $as_echo "$rubyhdrdir" >&6; }
76517651
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
76527652
RUBY_LIBS=
76537653
fi
7654+
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
7655+
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
7656+
fi
76547657
else
76557658
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
76567659
$as_echo "not found; disabling Ruby" >&6; }

src/configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,6 +2001,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
20012001
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
20022002
RUBY_LIBS=
20032003
fi
2004+
if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
2005+
RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
2006+
fi
20042007
else
20052008
AC_MSG_RESULT(not found; disabling Ruby)
20062009
fi

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2241,
753755
/**/
754756
2240,
755757
/**/

0 commit comments

Comments
 (0)