commit: 0c08a0f853e9fc3bcc089ca5ebf6e059a62272b4 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue May 3 17:09:10 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue May 3 17:44:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c08a0f8
dev-ml/ppx_fail: fix build with ocaml 4.03 Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ml/ppx_fail/files/oc43.patch | 35 +++++++++++++++++++++++++++++++ dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/dev-ml/ppx_fail/files/oc43.patch b/dev-ml/ppx_fail/files/oc43.patch new file mode 100644 index 0000000..c5dd6b2 --- /dev/null +++ b/dev-ml/ppx_fail/files/oc43.patch @@ -0,0 +1,35 @@ +diff -uNr ppx_fail-113.33.00/_oasis ppx_fail-113.33.00+4.03/_oasis +--- ppx_fail-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 ++++ ppx_fail-113.33.00+4.03/_oasis 2016-03-22 15:13:50.000000000 +0100 +@@ -1,8 +1,8 @@ + OASISFormat: 0.4 +-OCamlVersion: >= 4.02.3 ++OCamlVersion: >= 4.03.0 + FindlibVersion: >= 1.3.2 + Name: ppx_fail +-Version: 113.33.00 ++Version: 113.33.00+4.03 + Synopsis: Add location to calls to failwiths + Authors: Jane Street Group, LLC <[email protected]> + Copyrights: (C) 2015-2016 Jane Street Group LLC <[email protected]> +diff -uNr ppx_fail-113.33.00/opam ppx_fail-113.33.00+4.03/opam +--- ppx_fail-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 ++++ ppx_fail-113.33.00+4.03/opam 2016-03-22 17:51:36.000000000 +0100 +@@ -17,4 +17,4 @@ + "ppx_here" + "ppx_tools" {>= "0.99.3"} + ] +-available: [ ocaml-version >= "4.02.3" ] ++available: [ ocaml-version >= "4.03.0" ] +diff -uNr ppx_fail-113.33.00/src/ppx_fail.ml ppx_fail-113.33.00+4.03/src/ppx_fail.ml +--- ppx_fail-113.33.00/src/ppx_fail.ml 2016-03-09 16:44:54.000000000 +0100 ++++ ppx_fail-113.33.00+4.03/src/ppx_fail.ml 2016-03-22 15:13:50.000000000 +0100 +@@ -12,7 +12,7 @@ + match e.pexp_desc with + | Pexp_ident { txt = Lident "failwiths"; _ } -> + let loc = e.pexp_loc in +- pexp_apply e ~loc [("here", Ppx_here_expander.lift_position ~loc)] ++ pexp_apply e ~loc [(Labelled "here", Ppx_here_expander.lift_position ~loc)] + | _ -> super#expression e + end + diff --git a/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild b/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild index e835771..800d182 100644 --- a/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild +++ b/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild @@ -23,6 +23,10 @@ DEPEND="dev-ml/ppx_tools:= RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/opam" +src_prepare() { + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" +} + src_configure() { emake setup.exe OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
