Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/coq/files/, sci-mathematics/coq/
Date: Tue, 03 May 2016 09:14:26
Message-Id: 1462266832.7972add23cda61c8a53bb27cd71e1dff60b55070.aballier@gentoo
1 commit: 7972add23cda61c8a53bb27cd71e1dff60b55070
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 17:42:45 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 09:13:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7972add2
7
8 sci-mathematics/coq: fix build with ocaml 4.03
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 sci-mathematics/coq/coq-8.5_p1.ebuild | 1 +
14 sci-mathematics/coq/files/oc43.patch | 13 +++++++++++++
15 2 files changed, 14 insertions(+)
16
17 diff --git a/sci-mathematics/coq/coq-8.5_p1.ebuild b/sci-mathematics/coq/coq-8.5_p1.ebuild
18 index 1dffb39..b1cc467 100644
19 --- a/sci-mathematics/coq/coq-8.5_p1.ebuild
20 +++ b/sci-mathematics/coq/coq-8.5_p1.ebuild
21 @@ -39,6 +39,7 @@ S=${WORKDIR}/${MY_P}
22 src_prepare() {
23 epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch"
24 epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch"
25 + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
26 }
27
28 src_configure() {
29
30 diff --git a/sci-mathematics/coq/files/oc43.patch b/sci-mathematics/coq/files/oc43.patch
31 new file mode 100644
32 index 0000000..47fa10a
33 --- /dev/null
34 +++ b/sci-mathematics/coq/files/oc43.patch
35 @@ -0,0 +1,13 @@
36 +Index: coq-8.5pl1/Makefile.common
37 +===================================================================
38 +--- coq-8.5pl1.orig/Makefile.common
39 ++++ coq-8.5pl1/Makefile.common
40 +@@ -231,7 +231,7 @@ endif
41 + LINKCMO:=$(CORECMA) $(STATICPLUGINS)
42 + LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa)
43 +
44 +-IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo
45 ++IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo
46 + IDECMA:=ide/ide.cma
47 + IDETOPLOOPCMA=ide/coqidetop.cma
48 +