# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1609188304 -3600
# Node ID b9d94953d3e604c544efdccbe86ea04d14fcc655
# Parent  650c119d2273e3967e760b8aace58efd9496ca70
patch 8.2.2241: Build with Ruby and clang may fail

Commit: https://github.com/vim/vim/commit/864a28b6a6ae4f1a56e230be26bc6d13e3f8b3d9
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Dec 28 21:36:56 2020 +0100

    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 https://github.com/vim/vim/issues/7566)

diff --git a/ci/config.mk.clang.sed b/ci/config.mk.clang.sed
--- 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
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7651,6 +7651,9 @@ fi
 	  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
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2001,6 +2001,9 @@ if test "$enable_rubyinterp" = "yes" -o 
 	  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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2241,
+/**/
     2240,
 /**/
     2239,