commit: 1ad5dd3aad5751e18d1ffa0fa91acf8f5280169c Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Mar 1 18:44:00 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Mar 1 18:47:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad5dd3a
dev-ml/menhir: fix build with ocamlbuild 0.9.1 Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ml/menhir/files/ocamlbuild.patch | 13 +++++++++++++ dev-ml/menhir/menhir-20151112.ebuild | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dev-ml/menhir/files/ocamlbuild.patch b/dev-ml/menhir/files/ocamlbuild.patch new file mode 100644 index 0000000..6a8743f --- /dev/null +++ b/dev-ml/menhir/files/ocamlbuild.patch @@ -0,0 +1,13 @@ +Index: menhir-20151112/src/Makefile +=================================================================== +--- menhir-20151112.orig/src/Makefile ++++ menhir-20151112/src/Makefile +@@ -19,7 +19,7 @@ endif + # ---------------------------------------------------------------------------- + # Ocamlbuild tool and settings. + +-OCAMLBUILD := ocamlbuild -classic-display -j 0 -cflags "-safe-string -bin-annot" ++OCAMLBUILD := ocamlbuild -no-hygiene -classic-display -j 0 -cflags "-safe-string -bin-annot" + + # ---------------------------------------------------------------------------- + # For everyday development. diff --git a/dev-ml/menhir/menhir-20151112.ebuild b/dev-ml/menhir/menhir-20151112.ebuild index 61fb1e2..1b7e19d 100644 --- a/dev-ml/menhir/menhir-20151112.ebuild +++ b/dev-ml/menhir/menhir-20151112.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit findlib +inherit findlib eutils DESCRIPTION="LR(1) parser generator for the OCaml language" HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"; @@ -19,6 +19,10 @@ RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" DEPEND="${RDEPEND} dev-ml/ocamlbuild" +src_prepare() { + epatch "${FILESDIR}/ocamlbuild.patch" +} + src_configure() { if ! use ocamlopt ; then export TARGET=byte
