To: vim_dev@googlegroups.com Subject: Patch 8.0.1741 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1741 Problem: MS-Windows with msys2 cannot build Ruby statically. Solution: Add RUBY_VERSION to CFLAGS later. (Gray Wolf, closes #2833) Files: src/Make_cyg_ming.mak *** ../vim-8.0.1740/src/Make_cyg_ming.mak 2018-04-20 22:29:06.148195078 +0200 --- src/Make_cyg_ming.mak 2018-04-21 19:06:58.346156702 +0200 *************** *** 458,464 **** endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) - CFLAGS += -DRUBY_VERSION=$(RUBY_VER) endif endif # RUBY --- 458,463 ---- *************** *** 538,543 **** --- 537,545 ---- 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 *** ../vim-8.0.1740/src/version.c 2018-04-20 22:48:54.473394557 +0200 --- src/version.c 2018-04-21 19:08:43.901551910 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1741, /**/ -- Married is a three ring circus: First comes the engagement ring. Then comes the wedding ring. Then comes the suffering. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///