commit 1f47a287ee4f8b1d007dff878b23dd0cd6104f38
author K.Takata <kentkt@csc.jp> Mon Jan 31 13:25:36 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Jan 31 13:25:36 2022 +0000
tree db05f9be13f756180abceafaeb9d26ae30a0d5f0
parent 672776dbe8427876ef4bfce84520712df87b6eb1

patch 8.2.4271: MS-Windows: cannot build with Ruby 3.1.0

Problem:    MS-Windows: cannot build with Ruby 3.1.0.
Solution:   Adjust the DLL name and include directory. (Ken Takata,
            closes #9666)

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index ab71b26..585539d 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -466,6 +466,8 @@
 RUBY_PLATFORM = i386-mingw32
   else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
 RUBY_PLATFORM = x64-mingw32
+  else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt),)
+RUBY_PLATFORM = x64-mingw-ucrt
   else
 RUBY_PLATFORM = i386-mswin32
   endif
@@ -479,7 +481,9 @@
 # Base name of msvcrXX.dll which is used by ruby's dll.
 RUBY_MSVCRT_NAME = msvcrt
    endif
-   ifeq ($(ARCH),x86-64)
+   ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt)
+RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
+   else ifeq ($(ARCH),x86-64)
 RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
    else
 RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)

src/Make_mvc.mak

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 2725e74..00fe774 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1186,7 +1186,11 @@
 !   if "$(CPU)" == "i386"
 RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
 !   else # CPU
+!    if EXIST($(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt)
+RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
+!    else
 RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
+!    endif
 !   endif # CPU
 !  endif # RUBY_INSTALL_NAME
 

src/version.c

diff --git a/src/version.c b/src/version.c
index a8db110..9173627 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4271,
+/**/
     4270,
 /**/
     4269,