1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Upstream RubyGems changes from TruffleRuby

Browse Source 
https://github.com/rubygems/rubygems/commit/749a508968
This commit is contained in:
Benoit Daloze 2023-01-05 14:52:13 +01:00 committed by git
parent 365c6cc226
commit a94a2eea34
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/rubygems.rb
View File

@ -1337,6 +1337,17 @@ begin
rescue LoadError
end
# TruffleRuby >= 24 defines REUSE_AS_BINARY_ON_TRUFFLERUBY in defaults/truffleruby.
# However, TruffleRuby < 24 defines REUSE_AS_BINARY_ON_TRUFFLERUBY directly in its copy
# of lib/rubygems/platform.rb, so it is not defined if RubyGems is updated (gem update --system).
# Instead, we define it here in that case, similar to bundler/lib/bundler/rubygems_ext.rb.
# We must define it here and not in platform.rb because platform.rb is loaded before defaults/truffleruby.
class Gem::Platform
if RUBY_ENGINE == "truffleruby" && !defined?(REUSE_AS_BINARY_ON_TRUFFLERUBY)
REUSE_AS_BINARY_ON_TRUFFLERUBY = %w[libv8 libv8-node sorbet-static].freeze
end
end
##
# Loads the default specs.
Gem::Specification.load_defaults

18
lib/rubygems/platform.rb
View File

@ -43,10 +43,20 @@ class Gem::Platform
match_gem?(spec.platform, spec.name)
end
def self.match_gem?(platform, gem_name)
# NOTE: this method might be redefined by Ruby implementations to
# customize behavior per RUBY_ENGINE, gem_name or other criteria.
match_platforms?(platform, Gem.platforms)
if RUBY_ENGINE == "truffleruby"
def self.match_gem?(platform, gem_name)
raise "Not a string: #{gem_name.inspect}" unless String === gem_name
if REUSE_AS_BINARY_ON_TRUFFLERUBY.include?(gem_name)
match_platforms?(platform, [Gem::Platform::RUBY, Gem::Platform.local])
else
match_platforms?(platform, Gem.platforms)
end
end
else
def self.match_gem?(platform, gem_name)
match_platforms?(platform, Gem.platforms)
end
end
def self.sort_priority(platform)