diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-12 14:11:50 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-12 14:11:50 +0000 |
| commit | 0e4d6233829745a6ab848ce7c5752e7c5f038e39 (patch) | |
| tree | 71ce16413e5c4c1f046f447b790a26059188bf44 | |
| parent | Reorder build sequence, improve visual feedback of build process. Respect LDF... (diff) | |
| download | historical-0e4d6233829745a6ab848ce7c5752e7c5f038e39.tar.gz historical-0e4d6233829745a6ab848ce7c5752e7c5f038e39.tar.bz2 historical-0e4d6233829745a6ab848ce7c5752e7c5f038e39.zip | |
Use -j1 for build as per bug #279968.
Package-Manager: portage-2.2_rc58/cvs/Linux x86_64
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/ocaml/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.11.1.ebuild | 9 |
3 files changed, 15 insertions, 11 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/Manifest b/dev-lang/ocaml/Manifest index 123e6afdf258..6dcf2898c67f 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -11,13 +11,13 @@ DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb DIST ocaml-3.11.1.tar.gz 2859411 RMD160 7a48021e80602917cc91f7cc3305d5f3ab92b0bc SHA1 05ccb525bb53f8676e238de31209713ec38ae63a SHA256 70bf4ec660b07c9119123eb8ef2a5d9e5e98fac8c4082cca33b2622e91386b53 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49 EBUILD ocaml-3.10.2.ebuild 4519 RMD160 c74e33993f7220e03c05bd53b8561314fd2005d7 SHA1 6f0ed3f24d696e157593d0d10da8e90c6afa8dcf SHA256 877db782c1b7f868698aef2ac7ffafa3ef45c56ffd8f59c25fa83866f2de19d8 -EBUILD ocaml-3.11.1.ebuild 3986 RMD160 8e1c76d7a34b82a061d4dab4574f8d2a4b85dbfb SHA1 fc7ce91e9527719f2c38e6f161d654b3b363a597 SHA256 bf69a80b6b5d4a94048b6ba44db9968ffe619becd3cfdf4dfc84af023f9a5054 -MISC ChangeLog 27353 RMD160 3a261af13a081ddd37e2b6b859dd7a1e2b301b17 SHA1 41294e9231b52fc453264dd2ff4a8f3244543671 SHA256 032ec79c07e96f2426412c7b59001132425154a460256b6471ac44143efc6954 +EBUILD ocaml-3.11.1.ebuild 4014 RMD160 ad0f01489f02a87c676444f03aaa46326fc70158 SHA1 6d9d400f80fc9b3013a3c2544e5f7d9da5f6b82a SHA256 cf57c39869c312aac689afce98145a772d319e9ff4190ca01f9477a2455ffb93 +MISC ChangeLog 27472 RMD160 7be019a74d0fc04160bf10827afbc845c448aa12 SHA1 e046d5f3a32f7adfe03703c776b76f77d3f2f43a SHA256 27d62a72883e3732aac8883f1c8ab067fc6066068dfa6f0f24941705be49c450 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkq/gbEACgkQvFcC4BYPU0qWCACcCFWXsmnj/gumWJDjhtc9nYLZ -WQ8An04jNdWUzcDGIppKnEwcB4fJGHh1 -=Vyq8 +iEYEARECAAYFAksjpJoACgkQAiZjviIA2XjCuQCfSFMY2g9OAJ6wd8SnlIYN57yd +f9sAoLolJQC/U3pJ0ynyLESNaFpHpNKO +=LVL9 -----END PGP SIGNATURE----- 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 } |