ruby-changes:74004
From: nagachika <ko1@a...>
Date: Sat, 15 Oct 2022 17:28:36 +0900 (JST)
Subject: [ruby-changes:74004] d3f464094d (ruby_3_1): merge revision(s) 3112475469e35b522448858d23ee1651532276e7:
https://git.ruby-lang.org/ruby.git/commit/?id=d3f464094d From d3f464094d9a1308a32d34faa9055fa86c916828 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 15 Oct 2022 16:32:00 +0900 Subject: merge revision(s) 3112475469e35b522448858d23ee1651532276e7: Skip build extensions again on mswin and mingw --- tool/rbinstall.rb | 3 +++ 1 file changed, 3 insertions(+) --- tool/rbinstall.rb | 3 +++ version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 4832d60487..2e1b6d4bd8 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -848,6 +848,9 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L848 def write_cache_file end + def build_extensions + end if /mswin|mingw/ =~ RUBY_PLATFORM + def shebang(bin_file_name) path = File.join(gem_dir, spec.bindir, bin_file_name) first_line = File.open(path, "rb") {|file| file.gets} diff --git a/version.h b/version.h index 5daa3bbf68..8d6a959f18 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 81 +#define RUBY_PATCHLEVEL 82 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/