summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-09 04:38:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-09 04:38:58 +0000
commitabd5b8e1db39b9d3714fb491013ff8a156dcdf27 (patch)
tree9cc617689e8c9580371860ea0c4f2784552ffa37
parentdbe4a7f11c7f3bd6d60f88dbaef448a5491633b7 (diff)
extlibs.rb: patch options
* tool/extlibs.rb (do_patch): let "patch" command change the working directory and open the patch file there, instead of spawn options, so that proper error message will be shown by the command not just "chdir" or "open". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/extlibs.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d7d66d9..855a385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 9 13:38:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/extlibs.rb (do_patch): let "patch" command change the
+ working directory and open the patch file there, instead of
+ spawn options, so that proper error message will be shown by the
+ command not just "chdir" or "open".
+
Wed Sep 9 11:33:05 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
diff --git a/tool/extlibs.rb b/tool/extlibs.rb
index 09db055..6323d8f 100755
--- a/tool/extlibs.rb
+++ b/tool/extlibs.rb
@@ -70,7 +70,7 @@ def do_patch(dest, patch, args)
$stdout.puts "applying #{patch} under #{dest}"
$stdout.flush
end
- Process.wait(Process.spawn("patch", *args, in: File.join(dest, patch), chdir: dest))
+ Process.wait(Process.spawn("patch", "-d", dest, "-i", patch, *args))
$?.success? or raise "failed to patch #{patch}"
end