[前][次][番号順一覧][スレッド一覧]

ruby-changes:73352

From: =E3=81=AA=E3=81=A4=E3=81=8D <ko1@a...>
Date: Thu, 1 Sep 2022 15:01:53 +0900 (JST)
Subject: [ruby-changes:73352] aa5c1a0483 (master): [rubygems/rubygems] Support non gnu libc arm-linux-eabi platforms

https://git.ruby-lang.org/ruby.git/commit/?id=aa5c1a0483

From aa5c1a048385f31307165bd88e2eced89c8298a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= <i@n...>
Date: Wed, 31 Aug 2022 10:33:04 -0700
Subject: [rubygems/rubygems] Support non gnu libc arm-linux-eabi platforms

https://github.com/rubygems/rubygems/commit/fcf62799f2
---
 lib/bundler/rubygems_ext.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 056053a783..9b8455d0fc 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -259,7 +259,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/bundler/rubygems_ext.rb#L259
           # version
           (
             (@os != "linux" && (@version.nil? || other.version.nil?)) ||
-            (@os == "linux" && ((@version.nil? && ["gnu", "musl"].include?(other.version)) || (@version == "gnu" && other.version.nil?))) ||
+            (@os == "linux" && (other.version == "gnu#{@version}" || other.version == "musl#{@version}" || @version == "gnu#{other.version}")) ||
             @version == other.version
           )
       end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]