1 |
commit: bd2542990d1b0b8b3b68bc6d4c34c3bf64053690 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 17:05:23 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=bd254299 |
7 |
|
8 |
dev-ml/ppx_let: 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_let/files/oc43.patch | 44 +++++++++++++++++++++++++++++++++ |
14 |
dev-ml/ppx_let/ppx_let-113.33.00.ebuild | 4 +++ |
15 |
2 files changed, 48 insertions(+) |
16 |
|
17 |
diff --git a/dev-ml/ppx_let/files/oc43.patch b/dev-ml/ppx_let/files/oc43.patch |
18 |
new file mode 100644 |
19 |
index 0000000..2949642 |
20 |
--- /dev/null |
21 |
+++ b/dev-ml/ppx_let/files/oc43.patch |
22 |
@@ -0,0 +1,44 @@ |
23 |
+diff -uNr ppx_let-113.33.00/_oasis ppx_let-113.33.00+4.03/_oasis |
24 |
+--- ppx_let-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 |
25 |
++++ ppx_let-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_let |
32 |
+-Version: 113.33.00 |
33 |
++Version: 113.33.00+4.03 |
34 |
+ Synopsis: Monadic let-bindings |
35 |
+ Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
36 |
+ Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com> |
37 |
+diff -uNr ppx_let-113.33.00/opam ppx_let-113.33.00+4.03/opam |
38 |
+--- ppx_let-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 |
39 |
++++ ppx_let-113.33.00+4.03/opam 2016-03-22 17:51:37.000000000 +0100 |
40 |
+@@ -15,4 +15,4 @@ |
41 |
+ "ppx_core" |
42 |
+ "ppx_driver" |
43 |
+ ] |
44 |
+-available: [ ocaml-version >= "4.02.3" ] |
45 |
++available: [ ocaml-version >= "4.03.0" ] |
46 |
+diff -uNr ppx_let-113.33.00/src/ppx_let.ml ppx_let-113.33.00+4.03/src/ppx_let.ml |
47 |
+--- ppx_let-113.33.00/src/ppx_let.ml 2016-03-09 16:44:54.000000000 +0100 |
48 |
++++ ppx_let-113.33.00+4.03/src/ppx_let.ml 2016-03-22 15:13:50.000000000 +0100 |
49 |
+@@ -64,7 +64,7 @@ |
50 |
+ in |
51 |
+ pexp_apply ~loc |
52 |
+ (eoperator ~loc (Extension_name.operator_name extension_name)) |
53 |
+- [("", arg); (fn_label, fn)] |
54 |
++ [(Nolabel, arg); (Labelled fn_label, fn)] |
55 |
+ ;; |
56 |
+ |
57 |
+ let maybe_open extension_name ~to_open:module_to_open expr = |
58 |
+@@ -90,7 +90,7 @@ |
59 |
+ ppat_tuple ~loc [p; acc]) |
60 |
+ in |
61 |
+ bind_apply ~loc extension_name ~arg:nested_boths |
62 |
+- ~fn:(pexp_fun ~loc "" None nested_patterns |
63 |
++ ~fn:(pexp_fun ~loc Nolabel None nested_patterns |
64 |
+ (maybe_open extension_name ~to_open:open_in_body body)) |
65 |
+ ;; |
66 |
+ |
67 |
|
68 |
diff --git a/dev-ml/ppx_let/ppx_let-113.33.00.ebuild b/dev-ml/ppx_let/ppx_let-113.33.00.ebuild |
69 |
index b451b53..a721168 100644 |
70 |
--- a/dev-ml/ppx_let/ppx_let-113.33.00.ebuild |
71 |
+++ b/dev-ml/ppx_let/ppx_let-113.33.00.ebuild |
72 |
@@ -22,6 +22,10 @@ DEPEND="dev-ml/ppx_tools:= |
73 |
RDEPEND="${DEPEND}" |
74 |
DEPEND="${DEPEND} dev-ml/opam" |
75 |
|
76 |
+src_prepare() { |
77 |
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" |
78 |
+} |
79 |
+ |
80 |
src_configure() { |
81 |
emake setup.exe |
82 |
OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure |