| 1 |
commit: 0c08a0f853e9fc3bcc089ca5ebf6e059a62272b4 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 17:09:10 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 17:44:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c08a0f8 |
| 7 |
|
| 8 |
dev-ml/ppx_fail: fix build with ocaml 4.03 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ml/ppx_fail/files/oc43.patch | 35 +++++++++++++++++++++++++++++++ |
| 14 |
dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild | 4 ++++ |
| 15 |
2 files changed, 39 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-ml/ppx_fail/files/oc43.patch b/dev-ml/ppx_fail/files/oc43.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..c5dd6b2 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ml/ppx_fail/files/oc43.patch |
| 22 |
@@ -0,0 +1,35 @@ |
| 23 |
+diff -uNr ppx_fail-113.33.00/_oasis ppx_fail-113.33.00+4.03/_oasis |
| 24 |
+--- ppx_fail-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 |
| 25 |
++++ ppx_fail-113.33.00+4.03/_oasis 2016-03-22 15:13:50.000000000 +0100 |
| 26 |
+@@ -1,8 +1,8 @@ |
| 27 |
+ OASISFormat: 0.4 |
| 28 |
+-OCamlVersion: >= 4.02.3 |
| 29 |
++OCamlVersion: >= 4.03.0 |
| 30 |
+ FindlibVersion: >= 1.3.2 |
| 31 |
+ Name: ppx_fail |
| 32 |
+-Version: 113.33.00 |
| 33 |
++Version: 113.33.00+4.03 |
| 34 |
+ Synopsis: Add location to calls to failwiths |
| 35 |
+ Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
| 36 |
+ Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com> |
| 37 |
+diff -uNr ppx_fail-113.33.00/opam ppx_fail-113.33.00+4.03/opam |
| 38 |
+--- ppx_fail-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 |
| 39 |
++++ ppx_fail-113.33.00+4.03/opam 2016-03-22 17:51:36.000000000 +0100 |
| 40 |
+@@ -17,4 +17,4 @@ |
| 41 |
+ "ppx_here" |
| 42 |
+ "ppx_tools" {>= "0.99.3"} |
| 43 |
+ ] |
| 44 |
+-available: [ ocaml-version >= "4.02.3" ] |
| 45 |
++available: [ ocaml-version >= "4.03.0" ] |
| 46 |
+diff -uNr ppx_fail-113.33.00/src/ppx_fail.ml ppx_fail-113.33.00+4.03/src/ppx_fail.ml |
| 47 |
+--- ppx_fail-113.33.00/src/ppx_fail.ml 2016-03-09 16:44:54.000000000 +0100 |
| 48 |
++++ ppx_fail-113.33.00+4.03/src/ppx_fail.ml 2016-03-22 15:13:50.000000000 +0100 |
| 49 |
+@@ -12,7 +12,7 @@ |
| 50 |
+ match e.pexp_desc with |
| 51 |
+ | Pexp_ident { txt = Lident "failwiths"; _ } -> |
| 52 |
+ let loc = e.pexp_loc in |
| 53 |
+- pexp_apply e ~loc [("here", Ppx_here_expander.lift_position ~loc)] |
| 54 |
++ pexp_apply e ~loc [(Labelled "here", Ppx_here_expander.lift_position ~loc)] |
| 55 |
+ | _ -> super#expression e |
| 56 |
+ end |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild b/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild |
| 60 |
index e835771..800d182 100644 |
| 61 |
--- a/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild |
| 62 |
+++ b/dev-ml/ppx_fail/ppx_fail-113.33.00.ebuild |
| 63 |
@@ -23,6 +23,10 @@ DEPEND="dev-ml/ppx_tools:= |
| 64 |
RDEPEND="${DEPEND}" |
| 65 |
DEPEND="${DEPEND} dev-ml/opam" |
| 66 |
|
| 67 |
+src_prepare() { |
| 68 |
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" |
| 69 |
+} |
| 70 |
+ |
| 71 |
src_configure() { |
| 72 |
emake setup.exe |
| 73 |
OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure |
Archives