diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-09-29 20:31:23 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-10-01 05:46:40 +0900 |
| commit | f04d249e8309aaf22f667fd2d505c9b2ead2d30b (patch) | |
| tree | 4495d5fe107f84ce8d60422499c71c7bbcb982ca /lib/rubygems | |
| parent | 8252ea214061e1e8601ecfe178d010ed92ee8600 (diff) | |
[rubygems/rubygems] Fix matching of eabihf platforms
https://github.com/rubygems/rubygems/commit/a03d30cd58
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/platform.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 0935fd8971..4dc24971c3 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -181,7 +181,7 @@ class Gem::Platform # version ( (@os != "linux" && (@version.nil? || other.version.nil?)) || - (@os == "linux" && (normalized_linux_version == other.normalized_linux_version || other.version == "musl#{@version}" || other.version == "musleabi#{@version}")) || + (@os == "linux" && (normalized_linux_version == other.normalized_linux_version || ["musl#{@version}", "musleabi#{@version}", "musleabihf#{@version}"].include?(other.version))) || @version == other.version ) end @@ -189,7 +189,7 @@ class Gem::Platform def normalized_linux_version return nil unless @version - without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi\Z/, "") + without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi(hf)?\Z/, "") return nil if without_gnu_nor_abi_modifiers.empty? without_gnu_nor_abi_modifiers |