changeset 13734:600a38fe5c00

patch 8.0.1739: MS-Windows with msys2 cannot build Ruby statically commit https://github.com/vim/vim/commit/6176697203b0f168f4566597e15d8488b62ad490 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Apr 20 22:31:41 2018 +0200 patch 8.0.1739: MS-Windows with msys2 cannot build Ruby statically Problem: MS-Windows with msys2 cannot build Ruby statically. Solution: Define RUBY_VERSION. (Gray Wolf, closes https://github.com/vim/vim/issues/2826)
author Christian Brabandt <cb@256bit.org>
date Fri, 20 Apr 2018 22:45:07 +0200
parents c38b030ce737
children a62eeee5f116
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -390,7 +390,7 @@ endif
 
 #	Ruby interface:
 #	  RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak)
-#	  DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
+#	  DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically, "no" for static)
 #	  RUBY_VER=[Ruby version, eg 19, 22] (default is 22)
 #	  RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0]
 #			    (default is 2.2.0)
@@ -458,6 +458,7 @@ RUBYINC += -I $(RUBY)/include/ruby-$(RUB
 endif
 ifeq (no, $(DYNAMIC_RUBY))
 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
+CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
 endif
 
 endif # RUBY
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1739,
+/**/
     1738,
 /**/
     1737,