summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-10-23 03:13:04 +0000
committerKeri Harris <keri@gentoo.org>2006-10-23 03:13:04 +0000
commitfe03dd5a9b5d74e4c17935025e22daa4cfda2c02 (patch)
tree253e248f007981efbe040b1efa68e7843a600a33 /dev-lang
parentStable on SPARC wrt bug #152220. (diff)
downloadgentoo-2-fe03dd5a9b5d74e4c17935025e22daa4cfda2c02.tar.gz
gentoo-2-fe03dd5a9b5d74e4c17935025e22daa4cfda2c02.tar.bz2
gentoo-2-fe03dd5a9b5d74e4c17935025e22daa4cfda2c02.zip
Parallelize install_grades target in Mmake.rules.
(Portage version: 2.1.2_pre3-r6)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury/ChangeLog8
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch14
-rw-r--r--dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch14
-rw-r--r--dev-lang/mercury/mercury-0.12.2-r3.ebuild3
-rw-r--r--dev-lang/mercury/mercury-0.13.0.ebuild3
5 files changed, 39 insertions, 3 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 83ff7f49d0bb..424daf1a5dfb 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.59 2006/10/19 07:20:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.60 2006/10/23 03:13:04 keri Exp $
+
+ 23 Oct 2006; keri <keri@gentoo.org>
+ +files/mercury-0.12.2-parallel-install_grades.patch,
+ +files/mercury-0.13.0-parallel-install_grades.patch,
+ mercury-0.12.2-r3.ebuild, mercury-0.13.0.ebuild:
+ Parallelize install_grades target in Mmake.rules.
19 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2.ebuild,
mercury-0.12.2-r1.ebuild, mercury-0.12.2-r2.ebuild,
diff --git a/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch b/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch
new file mode 100644
index 000000000000..b2d3f0e181fa
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch
@@ -0,0 +1,14 @@
+--- mercury-compiler-0.12.2.orig/scripts/Mmake.rules 2005-01-28 20:11:58.000000000 +1300
++++ mercury-compiler-0.12.2/scripts/Mmake.rules 2006-10-23 15:56:28.000000000 +1300
+@@ -509,9 +509,9 @@
+ *.a *.so tmp_dir || true; } && \
+ for grade in $(ALL_LIBGRADES); do \
+ if [ "$$grade" != "$(GRADE)" ]; then \
+- $(MMAKE) GRADE=$$grade $*.depend || \
++ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade $*.depend || \
+ exit 1; \
+- $(MMAKE) GRADE=$$grade lib$*.install_library || \
++ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade lib$*.install_library || \
+ exit 1; \
+ for file in x $$grade_files; do \
+ if [ "$$file" != "x" ]; then \
diff --git a/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch b/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch
new file mode 100644
index 000000000000..efd43ccba069
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch
@@ -0,0 +1,14 @@
+--- mercury-compiler-0.13.0.orig/scripts/Mmake.rules 2006-02-24 20:11:20.000000000 +1300
++++ mercury-compiler-0.13.0/scripts/Mmake.rules 2006-10-23 16:01:05.000000000 +1300
+@@ -505,9 +505,9 @@
+ *.a *.so tmp_dir || true; } && \
+ for grade in $(ALL_LIBGRADES); do \
+ if [ "$$grade" != "$(GRADE)" ]; then \
+- $(MMAKE) GRADE=$$grade $*.depend || \
++ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade $*.depend || \
+ exit 1; \
+- $(MMAKE) GRADE=$$grade lib$*.install_library || \
++ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade lib$*.install_library || \
+ exit 1; \
+ for file in x $$grade_files; do \
+ if [ "$$file" != "x" ]; then \
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index 4962f17559af..b5f5be534739 100644
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.11 2006/10/19 07:20:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.12 2006/10/23 03:13:04 keri Exp $
inherit eutils
@@ -32,6 +32,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-bootstrap.patch
epatch "${FILESDIR}"/${P}-LIBDIR.patch
epatch "${FILESDIR}"/${P}-libgrades.patch
+ epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
epatch "${FILESDIR}"/${P}-deep_profiler.patch
epatch "${FILESDIR}"/${P}-docs.patch
diff --git a/dev-lang/mercury/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild
index aacfbdd4b268..53d9fa86408c 100644
--- a/dev-lang/mercury/mercury-0.13.0.ebuild
+++ b/dev-lang/mercury/mercury-0.13.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.7 2006/10/19 07:20:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.8 2006/10/23 03:13:04 keri Exp $
inherit eutils
@@ -32,6 +32,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-bootstrap.patch
epatch "${FILESDIR}"/${P}-LIBDIR.patch
epatch "${FILESDIR}"/${P}-libgrades.patch
+ epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
epatch "${FILESDIR}"/${P}-deep_profiler.patch
epatch "${FILESDIR}"/${P}-docs.patch