diff options
Diffstat (limited to 'dev/util/omake/omake-0.9.8.5_3.diff')
| -rw-r--r-- | dev/util/omake/omake-0.9.8.5_3.diff | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dev/util/omake/omake-0.9.8.5_3.diff b/dev/util/omake/omake-0.9.8.5_3.diff new file mode 100644 index 0000000..e2499e7 --- /dev/null +++ b/dev/util/omake/omake-0.9.8.5_3.diff @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_stdin_stdout_fix.dpatch by Mike Furr <mfurr@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: stdin <-> stdout fix (upstream r12115) + +@DPATCH@ +diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml +--- omake-0.9.8.5~/src/build/omake_rule.ml 2007-07-02 14:20:23.000000000 -0400 ++++ omake-0.9.8.5/src/build/omake_rule.ml 2007-09-06 12:52:23.752616976 -0400 +@@ -1040,12 +1040,12 @@ + * Evaluate the commands NOW. + *) + and exec_commands venv pos loc commands = +- let stdin = channel_of_var venv pos loc stdin_var in + let stdout = channel_of_var venv pos loc stdout_var in +- let stdin = Lm_channel.descr stdin in ++ let stderr = channel_of_var venv pos loc stderr_var in + let stdout = Lm_channel.descr stdout in ++ let stderr = Lm_channel.descr stderr in + List.iter (fun command -> +- let pid = eval_shell_internal stdin stdout command in ++ let pid = eval_shell_internal stdout stderr command in + let status, _ = eval_shell_wait venv pos pid in + let code = + match status with |