summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-08-02 12:19:49 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-08-02 12:19:49 +0000
commit84e9230268cf7bd5db0036c48a602cf859384def (patch)
treeb940562540d488b07a5224ab0b64ea07faebc3bd /dev-lang
parentRemove kde support from 0.65.2, so it can be marked stable, bug 279585 (diff)
downloadhistorical-84e9230268cf7bd5db0036c48a602cf859384def.tar.gz
historical-84e9230268cf7bd5db0036c48a602cf859384def.tar.bz2
historical-84e9230268cf7bd5db0036c48a602cf859384def.zip
Use serial make everywhere until fixed.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ocaml/ChangeLog5
-rw-r--r--dev-lang/ocaml/Manifest10
-rw-r--r--dev-lang/ocaml/ocaml-3.10.2.ebuild8
3 files changed, 13 insertions, 10 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 900ec0af6641..ec80170066b4 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.169 2009/08/01 23:11:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.170 2009/08/02 12:19:49 flameeyes Exp $
+
+ 02 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.10.2.ebuild:
+ Use serial make everywhere until fixed.
01 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.10.2.ebuild:
Use -j1 for make. Bug #279968.
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 5ba34f202d21..b0138c2509cf 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -10,14 +10,14 @@ AUX ocaml-rebuild.sh 1055 RMD160 a75f61820cfdc262912cc5af1241779bf900d4d7 SHA1 a
DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
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 4504 RMD160 9c964d1e78a1d4ec811444ba2fdee48a7fcc65ff SHA1 75ab64b64ff88d5b00c9a5b082cc493b8badda15 SHA256 38e1341d8faf1220d2fe395971bbf7054ceb3be8c3052400d620620ccf47e0ed
+EBUILD ocaml-3.10.2.ebuild 4519 RMD160 c74e33993f7220e03c05bd53b8561314fd2005d7 SHA1 6f0ed3f24d696e157593d0d10da8e90c6afa8dcf SHA256 877db782c1b7f868698aef2ac7ffafa3ef45c56ffd8f59c25fa83866f2de19d8
EBUILD ocaml-3.11.1.ebuild 3833 RMD160 651deba14573e94996d9e77a3d9d996ded9ac69c SHA1 32f543c9306936c4b0b33c072f3125080dfbc084 SHA256 58a384cf8ba6cf5e5936bca0c1132866e324b15e828c886644b481db79b1584b
-MISC ChangeLog 26884 RMD160 616d4db7644a1309108d2beafe054e3206537011 SHA1 5be0e62adee34429ccf2b9a829d3168605475f8e SHA256 cb13379681c3172e266aa8c047ebb80d1e8367aab5a22f7ef86eebd309ded34a
+MISC ChangeLog 27004 RMD160 8490b2ccad9b72a631f98a8e5da015d166323ad5 SHA1 734f0689306325b446f0c099ad7144cb6fb2f029 SHA256 f06b24340a460509b615ca328110fcbeafb76f8608ae753e776f7d139acd0349
MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkp0y8MACgkQAiZjviIA2XjSSQCgigi1L1mFwAd2P/lE/FPiA40g
-4b4An0wZA/8zqIbLK1je20zHipqW8Lhu
-=Sc0J
+iEYEARECAAYFAkp1hGoACgkQAiZjviIA2XggSACgkuYwky83GVrBKN33LMwIkJj0
+1oAAnjUCXWdFf8jfI6+YguamkmOJ5jCZ
+=75j4
-----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.10.2.ebuild b/dev-lang/ocaml/ocaml-3.10.2.ebuild
index 99d65be5c480..18d928ee8405 100644
--- a/dev-lang/ocaml/ocaml-3.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.2.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.10.2.ebuild,v 1.15 2009/08/01 23:11:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.16 2009/08/02 12:19:49 flameeyes Exp $
EAPI="1"
@@ -90,13 +90,13 @@ src_compile() {
# 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!"
+ emake -j1 opt || die "make opt failed!"
+ emake -j1 opt.opt || die "make opt.opt failed!"
fi
}
src_install() {
- make BINDIR="${D}"/usr/bin \
+ emake -j1 BINDIR="${D}"/usr/bin \
LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
MANDIR="${D}"/usr/share/man \
install || die "make install failed!"