summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2007-01-13 11:04:23 +0000
committerKeri Harris <keri@gentoo.org>2007-01-13 11:04:23 +0000
commitce4efea0edf0136d3de9114cabf9da80c2d2b553 (patch)
tree04c1d561ac3f007cd8be4653c967f81510fad1e6 /dev-lang/mercury-extras
parentFix java dependency to not accidentaly force =jdk-1.4, closes bug #161871 (diff)
downloadgentoo-2-ce4efea0edf0136d3de9114cabf9da80c2d2b553.tar.gz
gentoo-2-ce4efea0edf0136d3de9114cabf9da80c2d2b553.tar.bz2
gentoo-2-ce4efea0edf0136d3de9114cabf9da80c2d2b553.zip
Do not parallelize generation of .dep and .dv files.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'dev-lang/mercury-extras')
-rw-r--r--dev-lang/mercury-extras/ChangeLog6
-rw-r--r--dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild8
-rw-r--r--dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild12
3 files changed, 13 insertions, 13 deletions
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 <keri@gentoo.org> 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 <keri@gentoo.org>
-files/mercury-extras-0.13.0-concurrency.patch,
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