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 #2826)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 81dd9378f64d2e5f427132db37ef5f33c3745b1b..b21a1d40a183a2201b35ef872291838d6554e13e 100644 (file)
--- 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-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-
 endif
 ifeq (no, $(DYNAMIC_RUBY))
 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
+CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
 endif
 
 endif # RUBY

diff --git a/src/version.c b/src/version.c
index 2b5bf045b88ed048cc90d088ff7204db7708f3e1..a73994b93b2f30bb71192293479b52eed15f7d44 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1739,
 /**/
     1738,
 /**/