Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.10.2.ebuild
Date: Sun, 02 Aug 2009 12:19:51
Message-Id: E1MXa2X-0004I5-6Q@stork.gentoo.org
1 flameeyes 09/08/02 12:19:49
2
3 Modified: ChangeLog ocaml-3.10.2.ebuild
4 Log:
5 Use serial make everywhere until fixed.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.170 dev-lang/ocaml/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.170&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.170&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?r1=1.169&r2=1.170
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v
18 retrieving revision 1.169
19 retrieving revision 1.170
20 diff -u -r1.169 -r1.170
21 --- ChangeLog 1 Aug 2009 23:11:57 -0000 1.169
22 +++ ChangeLog 2 Aug 2009 12:19:49 -0000 1.170
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-lang/ocaml
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.169 2009/08/01 23:11:57 flameeyes Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.170 2009/08/02 12:19:49 flameeyes Exp $
28 +
29 + 02 Aug 2009; Diego E. Pettenò <flameeyes@g.o> ocaml-3.10.2.ebuild:
30 + Use serial make everywhere until fixed.
31
32 01 Aug 2009; Diego E. Pettenò <flameeyes@g.o> ocaml-3.10.2.ebuild:
33 Use -j1 for make. Bug #279968.
34
35
36
37 1.16 dev-lang/ocaml/ocaml-3.10.2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild?rev=1.16&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild?rev=1.16&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild?r1=1.15&r2=1.16
42
43 Index: ocaml-3.10.2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v
46 retrieving revision 1.15
47 retrieving revision 1.16
48 diff -u -r1.15 -r1.16
49 --- ocaml-3.10.2.ebuild 1 Aug 2009 23:11:57 -0000 1.15
50 +++ ocaml-3.10.2.ebuild 2 Aug 2009 12:19:49 -0000 1.16
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.15 2009/08/01 23:11:57 flameeyes Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.16 2009/08/02 12:19:49 flameeyes Exp $
56
57 EAPI="1"
58
59 @@ -90,13 +90,13 @@
60
61 # Native code generation can be disabled now
62 if use ocamlopt ; then
63 - make opt || die "make opt failed!"
64 - make opt.opt || die "make opt.opt failed!"
65 + emake -j1 opt || die "make opt failed!"
66 + emake -j1 opt.opt || die "make opt.opt failed!"
67 fi
68 }
69
70 src_install() {
71 - make BINDIR="${D}"/usr/bin \
72 + emake -j1 BINDIR="${D}"/usr/bin \
73 LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
74 MANDIR="${D}"/usr/share/man \
75 install || die "make install failed!"