ruby-changes:71748
From: Nobuyoshi <ko1@a...>
Date: Sat, 16 Apr 2022 09:04:39 +0900 (JST)
Subject: [ruby-changes:71748] 8a3663789c (master): Fix bundled gems installation when relative loading
https://git.ruby-lang.org/ruby.git/commit/?id=8a3663789c From 8a3663789c52ec5635194656af6b69d3d03120ee Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 16 Apr 2022 09:03:51 +0900 Subject: Fix bundled gems installation when relative loading --- tool/rbinstall.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index c40da1a4f3..7119022082 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -853,9 +853,6 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L853 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} @@ -907,6 +904,13 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L904 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 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/