Fix matching of eabihf platforms

rubygems · Sep 29, 2022 · a03d30c · a03d30c
1 parent 89362c1
commit a03d30c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/bundler/lib/bundler/rubygems_ext.rb b/bundler/lib/bundler/rubygems_ext.rb
@@ -261,7 +261,7 @@ def ===(other)
           # 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 @@ def ===(other)
       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
@@ -181,15 +181,15 @@ def ===(other)
       # 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
 
   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
@@ -336,21 +336,29 @@ def test_eabi_version_is_stricter_for_linux_os
   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