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)

diff --git a/ci/config.mk.clang.sed b/ci/config.mk.clang.sed
index 2e27c7c117df01b36a09a28dfb9dc9cfa7edcd19..da6044d83062db59ced3bda7df938e2a70fa885c 100644 (file)
--- a/ci/config.mk.clang.sed
+++ b/ci/config.mk.clang.sed
@@ -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/

diff --git a/src/auto/configure b/src/auto/configure
index f2486e9c4a2bb10c645d6c67d3ea530e5962585a..ebeed2cf4f9ed303a4cc43c582d93eefb39560e1 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -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; }

diff --git a/src/configure.ac b/src/configure.ac
index c024f65216cb7856ab731cad23d44b9c8455325f..d13e3783ce8f598806dfeeb14972da4d94e825f0 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -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

diff --git a/src/version.c b/src/version.c
index 39d2f26e15c1858e359b6c167638342de552a2ee..e9327f19b02e1fa40240b1e80cabeb881d56c829 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2241,
 /**/
     2240,
 /**/