Parallelize install_grades target in Mmake.rules.

Package-Manager: portage-2.1.2_pre3-r6

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 83ff7f49d0bb95588e28dd3bd6f8d447efbdb956..424daf1a5dfb9fdd1d9bfe0e291c9835ed7767e0 100644 (file)
--- 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/Manifest b/dev-lang/mercury/Manifest
index adc49c3799b3e2bfe8a71f478825fe338e3a40d3..a222734d5846f62c486e9fbbf696224e368fe051 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -26,6 +26,10 @@ AUX mercury-0.12.2-libgrades.patch 13195 RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5b
 MD5 64362ae02fa273afc3abba66681420c8 files/mercury-0.12.2-libgrades.patch 13195
 RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5ba5e54cae files/mercury-0.12.2-libgrades.patch 13195
 SHA256 ae6610ef3f61616601f03a8d6703595c2aaee7ca06fcbfaf15dbeb10cb358f6a files/mercury-0.12.2-libgrades.patch 13195
+AUX mercury-0.12.2-parallel-install_grades.patch 633 RMD160 0a72929eae70dce478a02898049abb4c7d63ddab SHA1 b6780296ac385c24486625079f790a8dfe2bc37f SHA256 ecf22afde46cfc249ce9269453cb606d6fdee11cb074667e08423a165554fd3e
+MD5 b933cb0e2cd26859533c52bacbc4b7c1 files/mercury-0.12.2-parallel-install_grades.patch 633
+RMD160 0a72929eae70dce478a02898049abb4c7d63ddab files/mercury-0.12.2-parallel-install_grades.patch 633
+SHA256 ecf22afde46cfc249ce9269453cb606d6fdee11cb074667e08423a165554fd3e files/mercury-0.12.2-parallel-install_grades.patch 633
 AUX mercury-0.12.2-portage-r1.patch 4311 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 SHA1 5cd9b30bfffbef94e1f0b182ad262bdf8c9b5ccd SHA256 0c3e24245829c21b1661c927cb155dba262f8d671ade173de796968c249e1e80
 MD5 4d8eab7ca5541308733940a58a5d6ecf files/mercury-0.12.2-portage-r1.patch 4311
 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 files/mercury-0.12.2-portage-r1.patch 4311
@@ -78,6 +82,10 @@ AUX mercury-0.13.0-mkinit.patch 484 RMD160 95a31a2349fa9cec8ee3f14a09c3f606b31ac
 MD5 5040ea06a637c9c160ab6c5542103908 files/mercury-0.13.0-mkinit.patch 484
 RMD160 95a31a2349fa9cec8ee3f14a09c3f606b31ac0e5 files/mercury-0.13.0-mkinit.patch 484
 SHA256 13959bd3c1378bc38e3469a80ecf6a544a30916f7f7e799f2785527edee5596a files/mercury-0.13.0-mkinit.patch 484
+AUX mercury-0.13.0-parallel-install_grades.patch 633 RMD160 c29c09ab486d5844267c7252e3ef7b7fe2e9400f SHA1 95592fb1348b1e1c512f90cbf179b6fedd2e7a6a SHA256 b55252444d4e93d80879151490ed6f3f58b3db6185e6defc44a0cf0152cc06c1
+MD5 19a002d59bfd65b6e582af78b2c6cbff files/mercury-0.13.0-parallel-install_grades.patch 633
+RMD160 c29c09ab486d5844267c7252e3ef7b7fe2e9400f files/mercury-0.13.0-parallel-install_grades.patch 633
+SHA256 b55252444d4e93d80879151490ed6f3f58b3db6185e6defc44a0cf0152cc06c1 files/mercury-0.13.0-parallel-install_grades.patch 633
 AUX mercury-0.13.0-portage.patch 2891 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 SHA1 7ea86360ddfdd869640980fcfae78f933becc02e SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c
 MD5 c50f24a88e741f61d40a29cfa974607f files/mercury-0.13.0-portage.patch 2891
 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 files/mercury-0.13.0-portage.patch 2891
@@ -98,22 +106,22 @@ EBUILD mercury-0.12.2-r2.ebuild 2106 RMD160 100058228ae209058982af9cffad25764840
 MD5 a40c37fdd48a9c2c07cb700486221f2b mercury-0.12.2-r2.ebuild 2106
 RMD160 100058228ae209058982af9cffad2576484002ef mercury-0.12.2-r2.ebuild 2106
 SHA256 3719b10a978d4048fe6aa42706acca04b44562dfbf431485fd94c09ba42dcb0d mercury-0.12.2-r2.ebuild 2106
-EBUILD mercury-0.12.2-r3.ebuild 3341 RMD160 1337009b32f08f224cfdf881f383e0983dee022c SHA1 f89faf08d3cd922b4034c236c758e1a1a9220519 SHA256 d9b8545ed1ae34d306f12ff3f52cb5bbac77e8b4fff952e465f324899aee64a9
-MD5 2e67c4da983a17c17dfcbc82704413a5 mercury-0.12.2-r3.ebuild 3341
-RMD160 1337009b32f08f224cfdf881f383e0983dee022c mercury-0.12.2-r3.ebuild 3341
-SHA256 d9b8545ed1ae34d306f12ff3f52cb5bbac77e8b4fff952e465f324899aee64a9 mercury-0.12.2-r3.ebuild 3341
+EBUILD mercury-0.12.2-r3.ebuild 3398 RMD160 a3303b195b86b9a82bd5ae6ebae65b36f98d09e8 SHA1 925fa365e11f2f8dffeabdaacdd4791a95ba8ea3 SHA256 93306dd30e68d2fdee8c74df11fcd9fb6b445436120c28e9e8fb7c74aaf5516a
+MD5 29e38a5d52c9ba58e08151940a904a69 mercury-0.12.2-r3.ebuild 3398
+RMD160 a3303b195b86b9a82bd5ae6ebae65b36f98d09e8 mercury-0.12.2-r3.ebuild 3398
+SHA256 93306dd30e68d2fdee8c74df11fcd9fb6b445436120c28e9e8fb7c74aaf5516a mercury-0.12.2-r3.ebuild 3398
 EBUILD mercury-0.12.2.ebuild 1456 RMD160 9cef2a6b3d64b48b9d3f398aeb3b1e990f1baa67 SHA1 861931cad8890f291e368a7b1d04f273b1695d6d SHA256 9c6f2f03bdc7f514c3e025b55702e73c3f1cabaab8ce4b2bd3645c44b96adcab
 MD5 02ec3d7e88f89c386d69e72fbac42e66 mercury-0.12.2.ebuild 1456
 RMD160 9cef2a6b3d64b48b9d3f398aeb3b1e990f1baa67 mercury-0.12.2.ebuild 1456
 SHA256 9c6f2f03bdc7f514c3e025b55702e73c3f1cabaab8ce4b2bd3645c44b96adcab mercury-0.12.2.ebuild 1456
-EBUILD mercury-0.13.0.ebuild 3395 RMD160 4d573c300d2e09e30cd996abd0e2fa99a7826cde SHA1 b32dff87972deb60db6a5cdd14d6c4e01dc7ec29 SHA256 ce0594891a79746b3c18948bff97bb3a47c6d14e973d5dc7f0141d1acfb4c570
-MD5 39cb1c6ae021f60e8601821c81c2d81c mercury-0.13.0.ebuild 3395
-RMD160 4d573c300d2e09e30cd996abd0e2fa99a7826cde mercury-0.13.0.ebuild 3395
-SHA256 ce0594891a79746b3c18948bff97bb3a47c6d14e973d5dc7f0141d1acfb4c570 mercury-0.13.0.ebuild 3395
-MISC ChangeLog 10581 RMD160 bfff39a68049bc282a9fbc7a912587c883b2d53f SHA1 fd39209a27562052e772f32228dbbb90fce7c397 SHA256 1baa4f726f1755fc7dfadb51542e7b4d7747429e6c041a37641fff6b9b28d132
-MD5 acb72d3c25226474e386dd8f33edc2bb ChangeLog 10581
-RMD160 bfff39a68049bc282a9fbc7a912587c883b2d53f ChangeLog 10581
-SHA256 1baa4f726f1755fc7dfadb51542e7b4d7747429e6c041a37641fff6b9b28d132 ChangeLog 10581
+EBUILD mercury-0.13.0.ebuild 3452 RMD160 975ec0f810c75d4bff66a423a5448d7438b88aa5 SHA1 2c21b594855e47760f9325c2b275b0fbc579e99c SHA256 2cc4880be06bc65ba9510754f7ff243d50f5c5e9101260f0fd0176a36cccef7c
+MD5 58aa664b9cb56540faf1b8e6c21ee6dc mercury-0.13.0.ebuild 3452
+RMD160 975ec0f810c75d4bff66a423a5448d7438b88aa5 mercury-0.13.0.ebuild 3452
+SHA256 2cc4880be06bc65ba9510754f7ff243d50f5c5e9101260f0fd0176a36cccef7c mercury-0.13.0.ebuild 3452
+MISC ChangeLog 10833 RMD160 c32224b4f1cbaae78546eda66ac0c22184d6e719 SHA1 b88200393beac1ac5ea36b8206736f5fb1d63226 SHA256 e34027e2cae21bca6dd8b8ae6eccc13b322bae91bcdc3fc2e128a9d9b4630aef
+MD5 a08b83944934e7816d5a46f0af9c7258 ChangeLog 10833
+RMD160 c32224b4f1cbaae78546eda66ac0c22184d6e719 ChangeLog 10833
+SHA256 e34027e2cae21bca6dd8b8ae6eccc13b322bae91bcdc3fc2e128a9d9b4630aef ChangeLog 10833
 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/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 (file)
index 0000000..b2d3f0e
--- /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 (file)
index 0000000..efd43cc
--- /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 4962f17559af4a61a91692f9fb2d3443d696e4c5..b5f5be534739a3d06ef5e9dceee8e13736bebe1c 100644 (file)
--- 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 aacfbdd4b268e00247e4c3d91471197f830d1cac..53d9fa86408c3bea817b1f9f620e20c7c9d4c09b 100644 (file)
--- 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