# HG changeset patch # User Christian Brabandt # Date 1524330905 -7200 # Node ID 1d8601bdd6e6d8039c2b6ded363ecb8279499d19 # Parent bb4cca5498a466b992103512a3d9d85dd85e57d9 patch 8.0.1741: MS-Windows with msys2 cannot build Ruby statically commit https://github.com/vim/vim/commit/259a90f7ce4d6d983a7fe5461da88cc52c46d9fe Author: Bram Moolenaar Date: Sat Apr 21 19:08:55 2018 +0200 patch 8.0.1741: MS-Windows with msys2 cannot build Ruby statically Problem: MS-Windows with msys2 cannot build Ruby statically. Solution: Add RUBY_VERSION to CFLAGS later. (Gray Wolf, closes https://github.com/vim/vim/issues/2833) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -458,7 +458,6 @@ 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 @@ -538,6 +537,9 @@ ifeq (yes, $(DYNAMIC_RUBY)) CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\" CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER) endif +ifeq (no, $(DYNAMIC_RUBY)) +CFLAGS += -DRUBY_VERSION=$(RUBY_VER) +endif ifneq ($(findstring w64-mingw32,$(CC)),) # A workaround for MinGW-w64 CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1741, +/**/ 1740, /**/ 1739,