To: vim_dev@googlegroups.com Subject: Patch 8.2.4271 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4271 Problem: MS-Windows: cannot build with Ruby 3.1.0. Solution: Adjust the DLL name and include directory. (Ken Takata, closes #9666) Files: src/Make_cyg_ming.mak, src/Make_mvc.mak *** ../vim-8.2.4270/src/Make_cyg_ming.mak 2022-01-31 12:26:47.847706522 +0000 --- src/Make_cyg_ming.mak 2022-01-31 13:23:38.748583981 +0000 *************** *** 466,471 **** --- 466,473 ---- 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,485 **** # Base name of msvcrXX.dll which is used by ruby's dll. RUBY_MSVCRT_NAME = msvcrt endif ! 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) --- 481,489 ---- # Base name of msvcrXX.dll which is used by ruby's dll. RUBY_MSVCRT_NAME = msvcrt endif ! 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) *** ../vim-8.2.4270/src/Make_mvc.mak 2022-01-31 12:26:47.847706522 +0000 --- src/Make_mvc.mak 2022-01-31 13:23:38.748583981 +0000 *************** *** 1186,1192 **** --- 1186,1196 ---- ! 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 *** ../vim-8.2.4270/src/version.c 2022-01-31 12:26:47.851706462 +0000 --- src/version.c 2022-01-31 13:25:12.791075932 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4271, /**/ -- Westheimer's Discovery: A couple of months in the laboratory can frequently save a couple of hours in the library. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///