diff --git a/unison/.md5sum b/unison/.md5sum index b6c7bbb5f..4783036bd 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1,2 +1 @@ -7cdb48c81f06304a0fd6f6c6479d90ce ocaml-4.03.patch -91ff2ef4141aede9af719fdd5e848bcb unison-2.48.3.tar.gz +5334b78c7e68169df7de95f4c6c4b60f unison-2.48.4.tar.gz diff --git a/unison/Pkgfile b/unison/Pkgfile index 7e7f100d3..d5a29b769 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -5,14 +5,12 @@ # Depends on: ocaml name=unison -version=2.48.3 -release=2 -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz - ocaml-4.03.patch) +version=2.48.4 +release=1 +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz) build() { - cd $name-$version - patch -p2 -i $SRC/ocaml-4.03.patch + cd src unset CFLAGS CXXFLAGS make -j1 UISTYLE=text THREADS=true NATIVE=true unison unison-fsmonitor install -d $PKG/usr/bin diff --git a/unison/ocaml-4.03.patch b/unison/ocaml-4.03.patch deleted file mode 100644 index a15ca0e64..000000000 --- a/unison/ocaml-4.03.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 4473822b5aa6de3e849ca6c958b365a71edbca4f -Author: Benjamin Pierce -Date: Sat May 14 11:28:49 2016 -0400 - - Fix build for OCaml 4.03.0 - -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 22b5b6c..b9a4cef 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -57,7 +57,8 @@ let opendir f = - let readdir = Unix.readdir - let closedir = Unix.closedir - let readlink = Unix.readlink --let symlink = Unix.symlink -+(* BCP 5/16: Eta-expand for backward compatibility with OCaml <=4.02 *) -+let symlink s1 s2 = Unix.symlink s1 s2 - let chdir = Sys.chdir - let getcwd = Sys.getcwd -