[rubygems/rubygems] Keep Gem.install_extension_in_lib for compatibility

rubygems/rubygems@b2bf239147
ruby · Feb 20, 2024 · f75b9db · f75b9db
1 parent f2d4533
commit f75b9db
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
@@ -47,6 +47,7 @@ class Gem::ConfigFile
   DEFAULT_CONCURRENT_DOWNLOADS = 8
   DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
   DEFAULT_IPV4_FALLBACK_ENABLED = false
+  # TODO: Use false as default value for this option in RubyGems 4.0
   DEFAULT_INSTALL_EXTENSION_IN_LIB = true
 
   ##

diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
@@ -247,6 +247,13 @@ def self.default_user_install # :nodoc:
     false
   end
 
+  ##
+  # Install extensions into lib as well as into the extension directory.
+
+  def self.install_extension_in_lib # :nodoc:
+    Gem.configuration.install_extension_in_lib
+  end
+
   ##
   # Directory where vendor gems are installed.
 

diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb
@@ -47,7 +47,7 @@ def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = D
 
       nesting = extension_nesting(extension)
 
-      if Gem.configuration.install_extension_in_lib && lib_dir
+      if Gem.install_extension_in_lib && lib_dir
         nested_lib_dir = File.join(lib_dir, nesting)
         FileUtils.mkdir_p nested_lib_dir
         FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true

diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
@@ -43,7 +43,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di
 
       full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
 
-      if Gem.configuration.install_extension_in_lib && lib_dir
+      if Gem.install_extension_in_lib && lib_dir
         FileUtils.mkdir_p lib_dir
         entries = Dir.entries(full_tmp_dest) - %w[. ..]
         entries = entries.map {|entry| File.join full_tmp_dest, entry }