From 89fcf63e7ccfd18e593f4d5a5396913c4d0c6f94 Mon Sep 17 00:00:00 2001 From: Lucas Marshall Date: Wed, 29 Oct 2014 13:18:44 -0700 Subject: 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 --- Library/Formula/unison.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Library/Formula') 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 -- cgit v1.2.3