diff options
| author | Juergen Daubert <jue@jue.li> | 2010-08-30 10:06:14 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-08-30 10:06:14 +0200 |
| commit | d85dbccb1771ee5af4a083615c8966f509e096db (patch) | |
| tree | 93c343e0018104824ab9352def69f45a1129325b /unison | |
| parent | fd7b3842cbd255bf474af9f203285645fa3d770d (diff) | |
| download | opt-d85dbccb1771ee5af4a083615c8966f509e096db.tar.gz opt-d85dbccb1771ee5af4a083615c8966f509e096db.tar.xz | |
unison: fix build with ocaml 3.12
Diffstat (limited to 'unison')
| -rw-r--r-- | unison/.md5sum | 1 | ||||
| -rw-r--r-- | unison/Pkgfile | 6 | ||||
| -rw-r--r-- | unison/unison-2.32.52_ocaml-3.12.patch | 15 |
3 files changed, 20 insertions, 2 deletions
diff --git a/unison/.md5sum b/unison/.md5sum index 5925ccca6..bbe629e12 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1 +1,2 @@ 0701f095c1721776a0454b94607eda48 unison-2.32.52.tar.gz +77b47f43c2953f09ed53989f4b7d37db unison-2.32.52_ocaml-3.12.patch diff --git a/unison/Pkgfile b/unison/Pkgfile index 3419cbb40..5cd5e8d1c 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -6,11 +6,13 @@ name=unison version=2.32.52 -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 + $name-${version}_ocaml-3.12.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-${version}_ocaml-3.12.patch unset CFLAGS CXXFLAGS make -j1 UISTYLE=text THREADS=true install -D -m 755 unison $PKG/usr/bin/unison diff --git a/unison/unison-2.32.52_ocaml-3.12.patch b/unison/unison-2.32.52_ocaml-3.12.patch new file mode 100644 index 000000000..bdd702faf --- /dev/null +++ b/unison/unison-2.32.52_ocaml-3.12.patch @@ -0,0 +1,15 @@ +# http://lists.seas.upenn.edu/pipermail/unison-hackers/2010-July/001437.html +# http://tech.groups.yahoo.com/group/unison-users/message/9348 + +diff -Nru unison-2.32.52.orig/update.mli unison-2.32.52/update.mli +--- unison-2.32.52.orig/update.mli 2010-08-29 19:47:19.747218034 +0200 ++++ unison-2.32.52/update.mli 2010-08-29 19:48:14.182482609 +0200 +@@ -1,7 +1,7 @@ + (* Unison file synchronizer: src/update.mli *) + (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) + +-module NameMap : Map.S with type key = Name.t ++module NameMap : MyMap.S with type key = Name.t + + type archive = + ArchiveDir of Props.t * archive NameMap.t |