diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 8 | ||||
| -rw-r--r-- | lib/rubygems/platform.rb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 201d2fef17..1747b7cf22 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -261,7 +261,7 @@ module Gem # version ( (@os != "linux" && (@version.nil? || other.version.nil?)) || - (@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || other.version == "musl#{@version}")) || + (@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || other.version == "musl#{@version}" || other.version == "musleabi#{@version}")) || @version == other.version ) end @@ -271,10 +271,10 @@ module Gem def normalized_linux_version_ext return nil unless @version - without_gnu = @version.sub(/\Agnu/, "") - return nil if without_gnu.empty? + without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi\Z/, "") + return nil if without_gnu_nor_abi_modifiers.empty? - without_gnu + without_gnu_nor_abi_modifiers end end end diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 1144879f9c..0935fd8971 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}")) || + (@os == "linux" && (normalized_linux_version == other.normalized_linux_version || other.version == "musl#{@version}" || other.version == "musleabi#{@version}")) || @version == other.version ) end @@ -189,10 +189,10 @@ class Gem::Platform def normalized_linux_version return nil unless @version - without_gnu = @version.sub(/\Agnu/, "") - return nil if without_gnu.empty? + without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi\Z/, "") + return nil if without_gnu_nor_abi_modifiers.empty? - without_gnu + without_gnu_nor_abi_modifiers end ## |