summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-05-01 19:42:45 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-05-03 11:13:52 +0200
commit7972add23cda61c8a53bb27cd71e1dff60b55070 (patch)
tree0d0f98cb718047dbde16d0873ff0e3b8c5369376 /sci-mathematics
parentdev-ml/ocaml-cstruct: bump to 2.0.0 (diff)
downloadgentoo-7972add23cda61c8a53bb27cd71e1dff60b55070.tar.gz
gentoo-7972add23cda61c8a53bb27cd71e1dff60b55070.tar.bz2
gentoo-7972add23cda61c8a53bb27cd71e1dff60b55070.zip
sci-mathematics/coq: fix build with ocaml 4.03
Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/coq/coq-8.5_p1.ebuild1
-rw-r--r--sci-mathematics/coq/files/oc43.patch13
2 files changed, 14 insertions, 0 deletions
diff --git a/sci-mathematics/coq/coq-8.5_p1.ebuild b/sci-mathematics/coq/coq-8.5_p1.ebuild
index 1dffb390cc78..b1cc46702a3b 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 000000000000..47fa10ab575e
--- /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
+