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

ruby-changes:64890

From: Nobuyoshi <ko1@a...>
Date: Fri, 15 Jan 2021 10:08:10 +0900 (JST)
Subject: [ruby-changes:64890] eb4319beaf (master): extlibs.rb: make patch command selectable [ci skip]

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

From eb4319beafedc5ea8541d06e0db30309af96eced Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 15 Jan 2021 09:32:35 +0900
Subject: extlibs.rb: make patch command selectable [ci skip]

Some Windows ports fail an assertion on patch files with LF EOL
code.  MSys2 patch.exe 2.7.6 seems fine, at least.

diff --git a/tool/extlibs.rb b/tool/extlibs.rb
index 8a9c5a8..5e8628c 100755
--- a/tool/extlibs.rb
+++ b/tool/extlibs.rb
@@ -90,7 +90,7 @@ class ExtLibs https://github.com/ruby/ruby/blob/trunk/tool/extlibs.rb#L90
       $stdout.puts "applying #{patch} under #{dest}"
       $stdout.flush
     end
-    Process.wait(Process.spawn("patch", "-d", dest, "-i", patch, *args))
+    Process.wait(Process.spawn(ENV.fetch("PATCH", "patch"), "-d", dest, "-i", patch, *args))
     $?.success? or raise "failed to patch #{patch}"
   end
 
-- 
cgit v0.10.2


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

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