| 1 |
commit: 1ad5dd3aad5751e18d1ffa0fa91acf8f5280169c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 1 18:44:00 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 1 18:47:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad5dd3a |
| 7 |
|
| 8 |
dev-ml/menhir: fix build with ocamlbuild 0.9.1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ml/menhir/files/ocamlbuild.patch | 13 +++++++++++++ |
| 14 |
dev-ml/menhir/menhir-20151112.ebuild | 6 +++++- |
| 15 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-ml/menhir/files/ocamlbuild.patch b/dev-ml/menhir/files/ocamlbuild.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..6a8743f |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ml/menhir/files/ocamlbuild.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+Index: menhir-20151112/src/Makefile |
| 24 |
+=================================================================== |
| 25 |
+--- menhir-20151112.orig/src/Makefile |
| 26 |
++++ menhir-20151112/src/Makefile |
| 27 |
+@@ -19,7 +19,7 @@ endif |
| 28 |
+ # ---------------------------------------------------------------------------- |
| 29 |
+ # Ocamlbuild tool and settings. |
| 30 |
+ |
| 31 |
+-OCAMLBUILD := ocamlbuild -classic-display -j 0 -cflags "-safe-string -bin-annot" |
| 32 |
++OCAMLBUILD := ocamlbuild -no-hygiene -classic-display -j 0 -cflags "-safe-string -bin-annot" |
| 33 |
+ |
| 34 |
+ # ---------------------------------------------------------------------------- |
| 35 |
+ # For everyday development. |
| 36 |
|
| 37 |
diff --git a/dev-ml/menhir/menhir-20151112.ebuild b/dev-ml/menhir/menhir-20151112.ebuild |
| 38 |
index 61fb1e2..1b7e19d 100644 |
| 39 |
--- a/dev-ml/menhir/menhir-20151112.ebuild |
| 40 |
+++ b/dev-ml/menhir/menhir-20151112.ebuild |
| 41 |
@@ -4,7 +4,7 @@ |
| 42 |
|
| 43 |
EAPI=5 |
| 44 |
|
| 45 |
-inherit findlib |
| 46 |
+inherit findlib eutils |
| 47 |
|
| 48 |
DESCRIPTION="LR(1) parser generator for the OCaml language" |
| 49 |
HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" |
| 50 |
@@ -19,6 +19,10 @@ RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" |
| 51 |
DEPEND="${RDEPEND} |
| 52 |
dev-ml/ocamlbuild" |
| 53 |
|
| 54 |
+src_prepare() { |
| 55 |
+ epatch "${FILESDIR}/ocamlbuild.patch" |
| 56 |
+} |
| 57 |
+ |
| 58 |
src_configure() { |
| 59 |
if ! use ocamlopt ; then |
| 60 |
export TARGET=byte |
Archives