| 1 |
commit: c159e6a2d43d1c5e1f0dad52b3c7d3de39c4d885 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 14:32:30 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 15:05:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c159e6a2 |
| 7 |
|
| 8 |
dev-ml/ppx_optcomp: fix build with ocaml 4.04 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-ml/ppx_optcomp/files/oc44.patch | 31 +++++++++++++++++++++++++ |
| 13 |
dev-ml/ppx_optcomp/ppx_optcomp-113.33.00.ebuild | 3 ++- |
| 14 |
2 files changed, 33 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ppx_optcomp/files/oc44.patch b/dev-ml/ppx_optcomp/files/oc44.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..332b58b |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ml/ppx_optcomp/files/oc44.patch |
| 21 |
@@ -0,0 +1,31 @@ |
| 22 |
+Index: ppx_optcomp-113.33.00/src/ppx_optcomp.ml |
| 23 |
+=================================================================== |
| 24 |
+--- ppx_optcomp-113.33.00.orig/src/ppx_optcomp.ml |
| 25 |
++++ ppx_optcomp-113.33.00/src/ppx_optcomp.ml |
| 26 |
+@@ -552,7 +552,7 @@ end = struct |
| 27 |
+ |
| 28 |
+ let rec next_directive (lexer : lexer) lexbuf = |
| 29 |
+ match lexer lexbuf with |
| 30 |
+- | SHARP -> parse_directive lexer lexbuf |
| 31 |
++ | HASH -> parse_directive lexer lexbuf |
| 32 |
+ | EOL -> next_directive lexer lexbuf |
| 33 |
+ | EOF -> endif_missing lexbuf |
| 34 |
+ | _ -> skip_line lexer lexbuf; next_directive lexer lexbuf |
| 35 |
+@@ -647,7 +647,7 @@ end = struct |
| 36 |
+ (* Return the next token from a stream, interpreting directives. *) |
| 37 |
+ let rec lexer_internal (lexer : lexer) lexbuf : Parser.token = |
| 38 |
+ match lexer lexbuf with |
| 39 |
+- | SHARP when at_bol lexbuf -> |
| 40 |
++ | HASH when at_bol lexbuf -> |
| 41 |
+ interpret_directive lexer lexbuf (parse_directive lexer lexbuf); |
| 42 |
+ lexer_internal lexer lexbuf |
| 43 |
+ | EOF -> Stack.check_eof lexbuf; EOF |
| 44 |
+@@ -749,7 +749,7 @@ end = struct |
| 45 |
+ Location.init lexbuf fn; |
| 46 |
+ let rec loop pos acc = |
| 47 |
+ match Lexer.token lexbuf with |
| 48 |
+- | SHARP when at_bol lexbuf -> |
| 49 |
++ | HASH when at_bol lexbuf -> |
| 50 |
+ let acc = (pos, Lexing.lexeme_start lexbuf) :: acc in |
| 51 |
+ interpret_directive Lexer.token lexbuf (parse_directive Lexer.token lexbuf); |
| 52 |
+ loop (Lexing.lexeme_end lexbuf) acc |
| 53 |
|
| 54 |
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-113.33.00.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-113.33.00.ebuild |
| 55 |
index f3ad68d..873416d 100644 |
| 56 |
--- a/dev-ml/ppx_optcomp/ppx_optcomp-113.33.00.ebuild |
| 57 |
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-113.33.00.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 1999-2015 Gentoo Foundation |
| 60 |
+# Copyright 1999-2016 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
# $Id$ |
| 63 |
|
| 64 |
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}" |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" |
| 68 |
+ has_version '>=dev-lang/ocaml-4.04' && epatch "${FILESDIR}/oc44.patch" |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
Archives