1 |
commit: e873d8de7f7e999e597ce5a35384185612a52f1c |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 17:20:53 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=e873d8de |
7 |
|
8 |
dev-ml/ppx_expect: 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_expect/files/oc43.patch | 49 +++++++++++++++++++++++++++ |
14 |
dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild | 4 +++ |
15 |
2 files changed, 53 insertions(+) |
16 |
|
17 |
diff --git a/dev-ml/ppx_expect/files/oc43.patch b/dev-ml/ppx_expect/files/oc43.patch |
18 |
new file mode 100644 |
19 |
index 0000000..3606d29 |
20 |
--- /dev/null |
21 |
+++ b/dev-ml/ppx_expect/files/oc43.patch |
22 |
@@ -0,0 +1,49 @@ |
23 |
+diff -uNr ppx_expect-113.33.01/expect_payload/ppx_expect_payload.ml ppx_expect-113.33.01+4.03/expect_payload/ppx_expect_payload.ml |
24 |
+--- ppx_expect-113.33.01/expect_payload/ppx_expect_payload.ml 2016-03-22 17:09:17.000000000 +0100 |
25 |
++++ ppx_expect-113.33.01+4.03/expect_payload/ppx_expect_payload.ml 2016-04-06 12:35:50.000000000 +0200 |
26 |
+@@ -63,7 +63,7 @@ |
27 |
+ |
28 |
+ let pattern () = |
29 |
+ Ast_pattern.( |
30 |
+- map (single_expr_payload (pexp_loc __ (pexp_constant (const_string __ __)))) |
31 |
++ map (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __)))) |
32 |
+ ~f:(fun f loc s tag -> f (Some (loc, s, tag))) |
33 |
+ ||| |
34 |
+ map (pstr nil) |
35 |
+diff -uNr ppx_expect-113.33.01/_oasis ppx_expect-113.33.01+4.03/_oasis |
36 |
+--- ppx_expect-113.33.01/_oasis 2016-03-22 17:09:17.000000000 +0100 |
37 |
++++ ppx_expect-113.33.01+4.03/_oasis 2016-04-06 12:35:50.000000000 +0200 |
38 |
+@@ -1,8 +1,8 @@ |
39 |
+ OASISFormat: 0.4 |
40 |
+-OCamlVersion: >= 4.02.3 |
41 |
++OCamlVersion: >= 4.03.0 |
42 |
+ FindlibVersion: >= 1.3.2 |
43 |
+ Name: ppx_expect |
44 |
+-Version: 113.33.01 |
45 |
++Version: 113.33.01+4.03 |
46 |
+ Synopsis: Cram like framework for OCaml |
47 |
+ Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
48 |
+ Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com> |
49 |
+diff -uNr ppx_expect-113.33.01/opam ppx_expect-113.33.01+4.03/opam |
50 |
+--- ppx_expect-113.33.01/opam 2016-03-22 18:31:21.000000000 +0100 |
51 |
++++ ppx_expect-113.33.01+4.03/opam 2016-04-06 12:54:27.000000000 +0200 |
52 |
+@@ -27,4 +27,4 @@ |
53 |
+ "sexplib" |
54 |
+ "variantslib" |
55 |
+ ] |
56 |
+-available: [ ocaml-version >= "4.02.3" ] |
57 |
++available: [ ocaml-version >= "4.03.0" ] |
58 |
+diff -uNr ppx_expect-113.33.01/src/expect_extension.ml ppx_expect-113.33.01+4.03/src/expect_extension.ml |
59 |
+--- ppx_expect-113.33.01/src/expect_extension.ml 2016-03-22 17:09:17.000000000 +0100 |
60 |
++++ ppx_expect-113.33.01+4.03/src/expect_extension.ml 2016-04-06 12:35:50.000000000 +0200 |
61 |
+@@ -24,9 +24,8 @@ |
62 |
+ pstr (( |
63 |
+ pstr_value nonrecursive ( |
64 |
+ value_binding |
65 |
+- ~pat:(map (pstring __) ~f:(fun f x -> f (Some x))) |
66 |
++ ~pat:(alt_option (pstring __) ppat_any) |
67 |
+ ~expr ^:: nil) |
68 |
+- ||| map (pstr_eval expr nil) ~f:(fun f -> f None) |
69 |
+ ) ^:: nil) |
70 |
+ |
71 |
+ let expect_test = |
72 |
|
73 |
diff --git a/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild b/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild |
74 |
index c605caa..4bb651b 100644 |
75 |
--- a/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild |
76 |
+++ b/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild |
77 |
@@ -34,6 +34,10 @@ DEPEND="dev-ml/ppx_tools:= |
78 |
RDEPEND="${DEPEND}" |
79 |
DEPEND="${DEPEND} dev-ml/opam" |
80 |
|
81 |
+src_prepare() { |
82 |
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" |
83 |
+} |
84 |
+ |
85 |
src_configure() { |
86 |
emake setup.exe |
87 |
OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure |