From 7972add23cda61c8a53bb27cd71e1dff60b55070 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 1 May 2016 19:42:45 +0200 Subject: [PATCH] sci-mathematics/coq: fix build with ocaml 4.03 Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier --- sci-mathematics/coq/coq-8.5_p1.ebuild | 1 + sci-mathematics/coq/files/oc43.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 sci-mathematics/coq/files/oc43.patch diff --git a/sci-mathematics/coq/coq-8.5_p1.ebuild b/sci-mathematics/coq/coq-8.5_p1.ebuild index 1dffb390cc781..b1cc46702a3be 100644 --- a/sci-mathematics/coq/coq-8.5_p1.ebuild +++ b/sci-mathematics/coq/coq-8.5_p1.ebuild @@ -39,6 +39,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch" epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch" + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" } src_configure() { diff --git a/sci-mathematics/coq/files/oc43.patch b/sci-mathematics/coq/files/oc43.patch new file mode 100644 index 0000000000000..47fa10ab575e0 --- /dev/null +++ b/sci-mathematics/coq/files/oc43.patch @@ -0,0 +1,13 @@ +Index: coq-8.5pl1/Makefile.common +=================================================================== +--- coq-8.5pl1.orig/Makefile.common ++++ coq-8.5pl1/Makefile.common +@@ -231,7 +231,7 @@ endif + LINKCMO:=$(CORECMA) $(STATICPLUGINS) + LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) + +-IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo ++IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo + IDECMA:=ide/ide.cma + IDETOPLOOPCMA=ide/coqidetop.cma +