unison: fix build with ocaml 4.02

https://groups.yahoo.com/neo/groups/unison-users/conversations/topics/11283
This commit is contained in:
Juergen Daubert 2014-10-24 11:05:03 +02:00
parent a2c94bbc0f
commit 3ac5f0b901
3 changed files with 21 additions and 2 deletions

View File

@ -1 +1,2 @@
6dede0c859811c1e5ce45216a3a23398 ubase_util.patch
42caf869f40440ed0e75eef07a605b2e unison-2.40.102.tar.gz

View File

@ -6,11 +6,13 @@
name=unison
version=2.40.102
release=1
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz)
release=2
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz
ubase_util.patch)
build() {
cd $name-$version
patch -p0 -i $SRC/ubase_util.patch
unset CFLAGS CXXFLAGS
make -j1 UISTYLE=text THREADS=true unison
install -D -m 755 unison $PKG/usr/bin/unison

16
unison/ubase_util.patch Normal file
View File

@ -0,0 +1,16 @@
$NetBSD: patch-ubase_util.ml,v 1.1 2014/10/22 09:43:01 wiz Exp $
Fix incompatibility with ocaml-4.02.x, based on
http://caml.inria.fr/mantis/view.php?id=6621
--- ubase/util.ml.orig 2010-04-15 17:29:31.000000000 +0000
+++ 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