https://git.ruby-lang.org/ruby.git/commit/?id=d4dadf5d9b

From d4dadf5d9baf2998b95550cb5bd7f55a4f11a729 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 15 Oct 2022 16:32:46 +0900
Subject: merge revision(s) 8a3663789c52ec5635194656af6b69d3d03120ee:

	Fix bundled gems installation when relative loading

	---
	 tool/rbinstall.rb | 10 +++++++---
	 1 file changed, 7 insertions(+), 3 deletions(-)
---
 tool/rbinstall.rb | 10 +++++++---
 version.h         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 941e6a02ed..b7ecb9a47b 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -848,9 +848,6 @@ 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 || RbConfig::CONFIG["CROSS_COMPILING"] == "yes"
-
     def shebang(bin_file_name)
       path = File.join(gem_dir, spec.bindir, bin_file_name)
       first_line = File.open(path, "rb") {|file| file.gets}
@@ -902,6 +899,13 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L899
       RbInstall.no_write(options) {super}
     end
 
+    if RbConfig::CONFIG["LIBRUBY_RELATIVE"] == "yes" || RbConfig::CONFIG["CROSS_COMPILING"] == "yes"
+      # TODO: always build extensions in bundled gems by build-ext and
+      # install the built binaries.
+      def build_extensions
+      end
+    end
+
     def generate_bin_script(filename, bindir)
       name = formatted_program_filename(filename)
       unless $dryrun
diff --git a/version.h b/version.h
index 5847fedf2c..7b96013c08 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 83
+#define RUBY_PATCHLEVEL 84
 
 #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/