ruby-changes:74023
From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 18:40:49 +0900 (JST)
Subject: [ruby-changes:74023] 2a0a9d56d4 (ruby_3_1): merge revision(s) 21f006f5f7c161fd3857f69186e810f1958bd7f0:
https://git.ruby-lang.org/ruby.git/commit/?id=2a0a9d56d4 From 2a0a9d56d4f927b597cd5ea2d1d5d0772e48970d Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 16 Oct 2022 16:41:57 +0900 Subject: merge revision(s) 21f006f5f7c161fd3857f69186e810f1958bd7f0: Retrieve previously configured macros also other than `extensions` --- template/exts.mk.tmpl | 1 - 1 file changed, 1 deletion(-) --- template/exts.mk.tmpl | 1 - version.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 506644143d..2bee7afe0a 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -30,7 +30,6 @@ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e| https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L30 s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| v.gsub!(/\\\n[ \t]*/, ' ') next if v.empty? - next if n != "extensions" n = "old_extensions" if n == "extensions" and !confexts.include?(e) v = v.split m = macros[n] ||= [] diff --git a/version.h b/version.h index 90ea886f14..1d4a6b0b90 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 93 +#define RUBY_PATCHLEVEL 94 #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/