diff options
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.11.1.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 5f5612333afa..0d0c7e368582 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ocaml # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.172 2009/09/27 15:15:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.173 2009/12/12 14:11:50 flameeyes Exp $ + + 12 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.11.1.ebuild: + Use -j1 for build as per bug #279968. 27 Sep 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.1.ebuild: Filter mfpmath=sse, it causes ocamlc.opt to segfault. Bug #285993 diff --git a/dev-lang/ocaml/ocaml-3.11.1.ebuild b/dev-lang/ocaml/ocaml-3.11.1.ebuild index 9e2bc27b29cf..023663d63de8 100644 --- a/dev-lang/ocaml/ocaml-3.11.1.ebuild +++ b/dev-lang/ocaml/ocaml-3.11.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v 1.6 2009/09/27 15:15:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v 1.7 2009/12/12 14:11:50 flameeyes Exp $ EAPI="1" @@ -74,12 +74,13 @@ src_compile() { -aspp "$(tc-getCC) -c" \ --with-pthread ${myconf} || die "configure failed!" - make world || die "make world failed!" + emake world || die "make world failed!" # Native code generation can be disabled now if use ocamlopt ; then - make opt || die "make opt failed!" - make opt.opt || die "make opt.opt failed!" + # bug #279968 + emake -j1 opt || die "make opt failed!" + emake -j1 opt.opt || die "make opt.opt failed!" fi } |