ruby-changes:74146
From: nagachika <ko1@a...>
Date: Thu, 20 Oct 2022 23:07:09 +0900 (JST)
Subject: [ruby-changes:74146] ecc6a717a4 (ruby_3_1): merge revision(s) 2d57447ae80e0b0895d6d22d606391b48516ba93:
https://git.ruby-lang.org/ruby.git/commit/?id=ecc6a717a4 From ecc6a717a4e6c808af96971ceb71224df6948bcf Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Thu, 20 Oct 2022 23:06:47 +0900 Subject: merge revision(s) 2d57447ae80e0b0895d6d22d606391b48516ba93: Fix missing replacement in 1f91dcdab3b --- template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- template/Makefile.in | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/Makefile.in b/template/Makefile.in index 1c664a095b..5e776e3a57 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -159,7 +159,7 @@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L159 yes_baseruby = $(HAVE_BASERUBY:no=) no_baseruby = $(HAVE_BASERUBY:yes=) -BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:$(MINIRUBY)) +BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:no=$(MINIRUBY)) BOOTSTRAPRUBY_OPT = $(yes_baseruby:yes=-r./$(arch)-fake) COROUTINE_H = @X_COROUTINE_H@ diff --git a/version.h b/version.h index c601b75131..c728754ede 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 119 +#define RUBY_PATCHLEVEL 120 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/