diff options
| author | Lucas Marshall | 2014-10-29 13:18:44 -0700 |
|---|---|---|
| committer | Jack Nagel | 2014-11-05 19:15:17 -0600 |
| commit | 89fcf63e7ccfd18e593f4d5a5396913c4d0c6f94 (patch) | |
| tree | 4282f7ae05058bf28b352615b42bb5593c1662d7 | |
| parent | 32b434727d62cc6161bea62480e70ca7f57342c1 (diff) | |
| download | homebrew-89fcf63e7ccfd18e593f4d5a5396913c4d0c6f94.tar.bz2 | |
unison: fix segfault on 10.10
Issue and fix is described here:
http://caml.inria.fr/mantis/view.php?id=6621
Closes #33719.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/unison.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Library/Formula/unison.rb b/Library/Formula/unison.rb index e16d55f8e..79343893f 100644 --- a/Library/Formula/unison.rb +++ b/Library/Formula/unison.rb @@ -14,6 +14,9 @@ class Unison < Formula depends_on 'objective-caml' => :build + # fixed upstream in https://webdav.seas.upenn.edu/viewvc/unison?view=revision&revision=530 + patch :DATA + def install ENV.j1 ENV.delete "CFLAGS" # ocamlopt reads CFLAGS but doesn't understand common options @@ -23,3 +26,17 @@ class Unison < Formula bin.install 'unison' end end + +__END__ +diff --git a/ubase/util.ml b/ubase/util.ml +index 2ed467f..e143f30 100644 +--- a/ubase/util.ml ++++ b/ubase/util.ml +@@ -62,7 +62,7 @@ let set_infos s = + if s <> !infos then begin clear_infos (); infos := s; show_infos () end + + let msg f = +- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f ++ clear_infos (); Printf.kfprintf (fun c -> flush c; show_infos ()) stderr f + + let msg : ('a, out_channel, unit) format -> 'a = msg |