From: Keri Harris Date: Sat, 13 Jan 2007 11:04:23 +0000 (+0000) Subject: Do not parallelize generation of .dep and .dv files. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99779a3d238aef1730537eb2495dd9e893ceb034;p=gentoo.git Do not parallelize generation of .dep and .dv files. Package-Manager: portage-2.1.2_rc4-r2 --- diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 3fe4a90b9362..4f57db7cb362 100644 --- a/dev-lang/mercury-extras/ChangeLog +++ b/dev-lang/mercury-extras/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury-extras # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.60 2007/01/13 10:46:28 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.61 2007/01/13 11:04:23 keri Exp $ + + 13 Jan 2007; keri mercury-extras-0.12.2-r2.ebuild, + mercury-extras-0.13.1.ebuild: + Do no parallelize generation of .dep and .dv files. 13 Jan 2007; keri -files/mercury-extras-0.13.0-concurrency.patch, diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index 0b525b73d7e4..4ba2bd157337 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -92,18 +92,18 @@ RMD160 f8bfff3e44e0cce647f523c0685ab9e35a31ef8b files/mercury-extras-0.13.1-trai SHA256 5d3aba19d04b7cee5ae6345d325def9406a95dcf58d3abcacc3ad2d708fb63a9 files/mercury-extras-0.13.1-trailed_update.patch 759 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA1 fc0f446f8b7f448c27f61bfe226a33fbaa007e0a SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8 DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c -EBUILD mercury-extras-0.12.2-r2.ebuild 3536 RMD160 8efe472b16c1bd0af1fc5f53ae27e7f32f5b8835 SHA1 04f8332adbf09efc7602fbb593f79557d5c32494 SHA256 e96d3e91fe866f9c17942426e4382322307fc73a2b4dfd8e1f8f85152fe6ef5d -MD5 94ebd43dfb5eb24a42ef7ddba7def138 mercury-extras-0.12.2-r2.ebuild 3536 -RMD160 8efe472b16c1bd0af1fc5f53ae27e7f32f5b8835 mercury-extras-0.12.2-r2.ebuild 3536 -SHA256 e96d3e91fe866f9c17942426e4382322307fc73a2b4dfd8e1f8f85152fe6ef5d mercury-extras-0.12.2-r2.ebuild 3536 -EBUILD mercury-extras-0.13.1.ebuild 3696 RMD160 4fb3439986a7bcd63b1fdf3a363016a5e8bbafef SHA1 22b079963ed48c55337a08eeee81848d8a632cec SHA256 29bcb476f9dc7365f5e2f12f0be5a0cd9885ae8297156793adc274406d8ccec0 -MD5 c548bdaa94f6c6933de9e6fa41020bce mercury-extras-0.13.1.ebuild 3696 -RMD160 4fb3439986a7bcd63b1fdf3a363016a5e8bbafef mercury-extras-0.13.1.ebuild 3696 -SHA256 29bcb476f9dc7365f5e2f12f0be5a0cd9885ae8297156793adc274406d8ccec0 mercury-extras-0.13.1.ebuild 3696 -MISC ChangeLog 16408 RMD160 e2fbbfa7fa087bf5da852a95dbed47e11a3f7547 SHA1 e7fb57a42899faed71aa91e1d3ad5246af8192b3 SHA256 cbd921fe4056cb2c0246e42142af08c381312667b7457057d9d57d706761d835 -MD5 7c2c16eccf0d457c59ca037d086387fc ChangeLog 16408 -RMD160 e2fbbfa7fa087bf5da852a95dbed47e11a3f7547 ChangeLog 16408 -SHA256 cbd921fe4056cb2c0246e42142af08c381312667b7457057d9d57d706761d835 ChangeLog 16408 +EBUILD mercury-extras-0.12.2-r2.ebuild 3485 RMD160 343320cd239c216f0958e6d5b05df880b35bae55 SHA1 6bd367edd987a326f0b4994f2ade2d8b9c3abe85 SHA256 b6b132bbf71a6fac48861092df3c873ad3be0b25c7ce70825c7b4a94f90bf9a7 +MD5 6af6c5b40e5f3249d02c611f02210559 mercury-extras-0.12.2-r2.ebuild 3485 +RMD160 343320cd239c216f0958e6d5b05df880b35bae55 mercury-extras-0.12.2-r2.ebuild 3485 +SHA256 b6b132bbf71a6fac48861092df3c873ad3be0b25c7ce70825c7b4a94f90bf9a7 mercury-extras-0.12.2-r2.ebuild 3485 +EBUILD mercury-extras-0.13.1.ebuild 3637 RMD160 9606d5dcb7cb9225c29fe31efef14348883f403a SHA1 a1739fee44ec35d5974aac6603ab0918989443c0 SHA256 488115e5f33c0c4c9dbcb411cb292bd186aa84f06352cc041905a515f575411a +MD5 8f2895c14768df02b19c8a97abe7d099 mercury-extras-0.13.1.ebuild 3637 +RMD160 9606d5dcb7cb9225c29fe31efef14348883f403a mercury-extras-0.13.1.ebuild 3637 +SHA256 488115e5f33c0c4c9dbcb411cb292bd186aa84f06352cc041905a515f575411a mercury-extras-0.13.1.ebuild 3637 +MISC ChangeLog 16566 RMD160 33c1290067a8c146048241f60b8d44d4d780e2a3 SHA1 9d22d8953ee3ccdab22d61b6986f7d269fda0072 SHA256 48023ef80a8bbf3285f79965a047ef6066a9823bf8193e689e05da36d86d580e +MD5 512b89976f111d0a17c5acd92dae89b5 ChangeLog 16566 +RMD160 33c1290067a8c146048241f60b8d44d4d780e2a3 ChangeLog 16566 +SHA256 48023ef80a8bbf3285f79965a047ef6066a9823bf8193e689e05da36d86d580e ChangeLog 16566 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild index 5af9bf24390a..76138347ad69 100644 --- a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.14 2007/01/09 09:06:47 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.15 2007/01/13 11:04:23 keri Exp $ inherit eutils @@ -61,8 +61,7 @@ src_unpack() { src_compile() { mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ - depend || die "mmake depend failed" + -j1 depend || die "mmake depend failed" mmake \ MMAKEFLAGS="${MAKEOPTS}" \ EXTRA_MLFLAGS=--no-strip \ @@ -72,9 +71,8 @@ src_compile() { cd "${S}"/graphics/mercury_opengl cp ../mercury_tcltk/mtcltk.m ./ mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ -f Mmakefile.mtogl \ - depend || die "mmake depend mtogl failed" + -j1 depend || die "mmake depend mtogl failed" mmake \ MMAKEFLAGS="${MAKEOPTS}" \ -f Mmakefile.mtogl \ diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild index 40c321193490..08518f964f8a 100644 --- a/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild,v 1.2 2007/01/09 09:06:47 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild,v 1.3 2007/01/13 11:04:23 keri Exp $ inherit eutils @@ -68,8 +68,7 @@ src_unpack() { src_compile() { mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ - depend || die "mmake depend failed" + -j1 depend || die "mmake depend failed" mmake \ MMAKEFLAGS="${MAKEOPTS}" \ EXTRA_MLFLAGS=--no-strip \ @@ -79,9 +78,8 @@ src_compile() { cd "${S}"/graphics/mercury_opengl cp ../mercury_tcltk/mtcltk.m ./ mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ -f Mmakefile.mtogl \ - depend || die "mmake depend mtogl failed" + -j1 depend || die "mmake depend mtogl failed" mmake \ MMAKEFLAGS="${MAKEOPTS}" \ -f Mmakefile.mtogl \ @@ -93,7 +91,7 @@ src_install() { cd "${S}" mmake \ MMAKEFLAGS="${MAKEOPTS}" \ - INSTALL_PREFIX="${D}"/usr \ + INSTALL_PREFIX="${D}" \ install || die "mmake install failed" if use opengl && use tcl && use tk ; then @@ -102,7 +100,7 @@ src_install() { mv Mmakefile.mtogl Mmakefile mmake \ MMAKEFLAGS="${MAKEOPTS}" \ - INSTALL_PREFIX="${D}"/usr \ + INSTALL_PREFIX="${D}" \ install || die "mmake install mtogl failed" fi