From f75b9dbf7dd86f8fa6777a9c9c960c310c940261 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 17 Mar 2023 20:47:00 +0900 Subject: [PATCH] [rubygems/rubygems] Keep Gem.install_extension_in_lib for compatibility https://github.com/rubygems/rubygems/commit/b2bf239147 --- lib/rubygems/config_file.rb | 1 + lib/rubygems/defaults.rb | 7 +++++++ lib/rubygems/ext/cargo_builder.rb | 2 +- lib/rubygems/ext/ext_conf_builder.rb | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index 886bd6695329d5..6f83fe2c79d0b5 100644 --- 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 index b18180a8a48588..1bd208feb977f2 100644 --- 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 index c4feb267982cca..43973a975addb3 100644 --- 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 index de487484dfe201..fb68a7a8cc65cc 100644 --- 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 }