From d1fb0a39537d4536869921383ee2a223cc6dfac9 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Mon, 1 Feb 2021 20:27:16 +0900 Subject: [PATCH] merge revision(s) 952b2dcc8804cbf094f8f626e04bcb3f8e151005: [Backport #17602] Fix for windres 2.36 [Bug #17602] Add --preprocessor and --preprocessor-arg for each preprocessor command arguments, as windres 2.36 requires preprocessor name and arguments to be separated to respect spaces in these paths. --- cygwin/GNUmakefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- cygwin/GNUmakefile.in | 5 ++++- version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index e9f186f121..86098814a1 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -4,7 +4,10 @@ include Makefile ENABLE_SHARED=@ENABLE_SHARED@ DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)" -WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED +windres-cpp := $(CPP) -xc +windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \ + $(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp))) +WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED STRIP = @STRIP@ ifeq (@target_os@,cygwin) diff --git a/version.h b/version.h index d106a98cf3..4dd36f0766 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 19 +#define RUBY_PATCHLEVEL 20 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2