To: vim_dev@googlegroups.com
Subject: Patch 8.2.2241
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2241
Problem:    Build with Ruby and clang may fail.
Solution:   Adjust congigure and sed script. (Ozaki Kiichi, closes #7566)
Files:      ci/config.mk.clang.sed, src/auto/configure, src/configure.ac


*** ../vim-8.2.2240/ci/config.mk.clang.sed	2020-12-28 15:07:42.129637933 +0100
--- ci/config.mk.clang.sed	2020-12-28 21:29:30.470239831 +0100
***************
*** 1,2 ****
  /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
! /^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes -fms-extensions/
--- 1,2 ----
  /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
! /^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
*** ../vim-8.2.2240/src/auto/configure	2020-12-23 12:33:37.649652622 +0100
--- src/auto/configure	2020-12-28 21:30:54.581984099 +0100
***************
*** 7651,7656 ****
--- 7651,7659 ----
  	  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; }
*** ../vim-8.2.2240/src/configure.ac	2020-12-23 12:33:37.645652637 +0100
--- src/configure.ac	2020-12-28 21:29:30.470239831 +0100
***************
*** 2001,2006 ****
--- 2001,2009 ----
  	  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
*** ../vim-8.2.2240/src/version.c	2020-12-28 21:15:11.456883388 +0100
--- src/version.c	2020-12-28 21:30:50.353997164 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2241,
  /**/

-- 
Change is inevitable, except from a vending machine.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///