Ticket #18786: devel--omake.patch

File devel--omake.patch, 4.1 KB (added by Damien.Pollet@…, 9 years ago)
  • devel/omake/Portfile

    diff -ruN /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/omake/Portfile devel/omake/Portfile
    old new  
    11# $Id: Portfile 31207 2007-11-18 10:25:12Z erickt@macports.org $
    22
    33PortSystem          1.0
     4
    45name                omake
    56version             0.9.8.5-3
     7platforms           darwin
    68categories          devel
    79maintainers         erickt@macports.org
    810description         OMake is a build system designed for scalability and portability
     
    1820                    sha1 e78c9d8858749f5e234cba303637980e24085cbc \
    1921                    rmd160 2364e29a7cc9bd6aaf837818bbe0a64ef4afce14
    2022
    21 patchfiles          stdin_stdout.bin
     23patchfiles          patch-stdin_stdout.bin.diff patch-omake.diff
    2224
    2325depends_lib         port:ocaml
    2426
  • devel/omake/files/patch-omake.diff

    diff -ruN /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/omake/files/patch-omake.diff devel/omake/files/patch-omake.diff
    old new  
     1--- src/exec/omake_exec.ml.orig Thu Nov 27 14:20:45 2008
     2+++ src/exec/omake_exec.ml      Thu Nov 27 14:20:50 2008
     3@@ -46,8 +46,6 @@ open Omake_exec_notify
     4 open Omake_options
     5 open Omake_command_type
     6 
     7-external sync : unit -> unit = "caml_sync"
     8-
     9 module Exec =
     10 struct
     11    (*
  • devel/omake/files/patch-stdin_stdout.bin.diff

    diff -ruN /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/omake/files/patch-stdin_stdout.bin.diff devel/omake/files/patch-stdin_stdout.bin.diff
    old new  
     1diff -urNad src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
     2--- src/build/omake_rule.ml     2007-07-02 14:20:23.000000000 -0400
     3+++ src/build/omake_rule.ml     2007-09-06 12:52:23.752616976 -0400
     4@@ -1040,12 +1040,12 @@
     5  * Evaluate the commands NOW.
     6  *)
     7 and exec_commands venv pos loc commands =
     8-   let stdin  = channel_of_var venv pos loc stdin_var in
     9    let stdout = channel_of_var venv pos loc stdout_var in
     10-   let stdin  = Lm_channel.descr stdin in
     11+   let stderr = channel_of_var venv pos loc stderr_var in
     12    let stdout = Lm_channel.descr stdout in
     13+   let stderr = Lm_channel.descr stderr in
     14       List.iter (fun command ->
     15-            let pid = eval_shell_internal stdin stdout command in
     16+            let pid = eval_shell_internal stdout stderr command in
     17             let status, _ = eval_shell_wait venv pos pid in
     18             let code =
     19                match status with
  • devel/omake/files/stdin_stdout.bin

    diff -ruN /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/omake/files/stdin_stdout.bin devel/omake/files/stdin_stdout.bin
    old new  
    1 diff -urNad src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
    2 --- src/build/omake_rule.ml     2007-07-02 14:20:23.000000000 -0400
    3 +++ src/build/omake_rule.ml     2007-09-06 12:52:23.752616976 -0400
    4 @@ -1040,12 +1040,12 @@
    5   * Evaluate the commands NOW.
    6   *)
    7  and exec_commands venv pos loc commands =
    8 -   let stdin  = channel_of_var venv pos loc stdin_var in
    9     let stdout = channel_of_var venv pos loc stdout_var in
    10 -   let stdin  = Lm_channel.descr stdin in
    11 +   let stderr = channel_of_var venv pos loc stderr_var in
    12     let stdout = Lm_channel.descr stdout in
    13 +   let stderr = Lm_channel.descr stderr in
    14        List.iter (fun command ->
    15 -            let pid = eval_shell_internal stdin stdout command in
    16 +            let pid = eval_shell_internal stdout stderr command in
    17              let status, _ = eval_shell_wait venv pos pid in
    18              let code =
    19                 match status with