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 | |
| parent | 8252ea214061e1e8601ecfe178d010ed92ee8600 (diff) | |
[rubygems/rubygems] Fix matching of eabihf platforms
https://github.com/rubygems/rubygems/commit/a03d30cd58
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/platform.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_platform.rb | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 1747b7cf22..d53d688009 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}" || other.version == "musleabi#{@version}")) || + (@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || ["musl#{@version}", "musleabi#{@version}", "musleabihf#{@version}"].include?(other.version))) || @version == other.version ) end @@ -271,7 +271,7 @@ module Gem def normalized_linux_version_ext 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 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 diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index 03417d755a..ecb902ddbe 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -336,21 +336,29 @@ class TestGemPlatform < Gem::TestCase def test_eabi_and_nil_version_combination_strictness arm_linux = Gem::Platform.new "arm-linux" arm_linux_eabi = Gem::Platform.new "arm-linux-eabi" + arm_linux_eabihf = Gem::Platform.new "arm-linux-eabihf" arm_linux_gnueabi = Gem::Platform.new "arm-linux-gnueabi" + arm_linux_gnueabihf = Gem::Platform.new "arm-linux-gnueabihf" arm_linux_musleabi = Gem::Platform.new "arm-linux-musleabi" + arm_linux_musleabihf = Gem::Platform.new "arm-linux-musleabihf" arm_linux_uclibceabi = Gem::Platform.new "arm-linux-uclibceabi" + arm_linux_uclibceabihf = Gem::Platform.new "arm-linux-uclibceabihf" # generic arm host runtime with eabi modifier accepts generic arm gems assert(arm_linux === arm_linux_eabi, "arm-linux =~ arm-linux-eabi") + assert(arm_linux === arm_linux_eabihf, "arm-linux =~ arm-linux-eabihf") # explicit gnu arm host runtime with eabi modifier accepts generic arm gems assert(arm_linux === arm_linux_gnueabi, "arm-linux =~ arm-linux-gnueabi") + assert(arm_linux === arm_linux_gnueabihf, "arm-linux =~ arm-linux-gnueabihf") # musl arm host runtime accepts libc-generic or statically linked gems... assert(arm_linux === arm_linux_musleabi, "arm-linux =~ arm-linux-musleabi") + assert(arm_linux === arm_linux_musleabihf, "arm-linux =~ arm-linux-musleabihf") # other libc arm hosts are not glibc compatible refute(arm_linux === arm_linux_uclibceabi, "arm-linux =~ arm-linux-uclibceabi") + refute(arm_linux === arm_linux_uclibceabihf, "arm-linux =~ arm-linux-uclibceabihf") end def test_equals3_cpu_arm |