Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
Date: Tue, 14 Feb 2017 09:36:06
Message-Id: 1487064937.986a8aa3a3f412a8f03bd1bad99f5af8387c6392.aballier@gentoo
1 commit: 986a8aa3a3f412a8f03bd1bad99f5af8387c6392
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 14 09:35:37 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 09:35:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a8aa3
7
8 dev-ml/ocamlgraph: Apply upstream patch to fix make check with ocaml 4.04. Bug #608554.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch | 19 +++++++++++++++++++
13 dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 1 +
14 2 files changed, 20 insertions(+)
15
16 diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
17 new file mode 100644
18 index 0000000000..f0d370cfd9
19 --- /dev/null
20 +++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
21 @@ -0,0 +1,19 @@
22 +commit 726e8d6e31224eb70f75655579da9a374e910b98
23 +Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@×××.fr>
24 +Date: Mon Feb 13 08:41:58 2017 +0100
25 +
26 + fixed 'make check'
27 +
28 +diff --git a/Makefile.in b/Makefile.in
29 +index 58b9e9c..9ce40df 100644
30 +--- a/Makefile.in
31 ++++ b/Makefile.in
32 +@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml
33 + $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^
34 +
35 + check: $(CMA) tests/check.ml bin/test-ts
36 +- ocaml $(CMA) tests/test_clique.ml tests/check.ml
37 ++ ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml
38 + bin/test-ts 10
39 +
40 + # Additional rules
41
42 diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
43 index 3cbbd5a4bf..1f4cef1a8b 100644
44 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
45 +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
46 @@ -20,6 +20,7 @@ IUSE="doc examples gtk +ocamlopt"
47
48 src_prepare() {
49 epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch"
50 + epatch "${FILESDIR}/${P}-test.patch"
51 }
52
53 src_compile() {