Add bootstrap_depend step to stop race condition in mmc dependency generation; document src_compile() steps

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 25 insertions, 6 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index c48d1e17dbaa..42f341d8ecfb 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.127 2010/11/06 09:18:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.128 2010/11/06 20:58:43 keri Exp $
+
+  06 Nov 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild:
+  Add bootstrap_depend step to stop race condition in mmc dependency
+  generation; document src_compile() steps
 
   06 Nov 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild:
   Use 2-pass mercury_compiler bootstrap to allow patching .m files; closes
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index afcca602f19d..a002b9765532 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -12,7 +12,7 @@ AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed7
 DIST mercury-10.04-gentoo-patchset-0.tar.gz 8036 RMD160 6afb964cf8b592141e6b3af3b9e6cc0679a34914 SHA1 0a5fa28b9577184165ec715ba928d7430c9b03c9 SHA256 25f350abc14bc1638d328df2365aa5fa4f3208b7c3c244cf3908cfdb54d36c1a
 DIST mercury-10.04.1-gentoo-patchset-0.tar.gz 9013 RMD160 59e8c0507bd2bcfb55d83425d72a89adfa5e64a0 SHA1 30b10271f342e893cfab67426c0fd25d3f06845f SHA256 14f1fb3c3927cd7c5d16407e0003b5531248f7b49f4a202e7dd288f8da5fddac
 DIST mercury-10.04.2-gentoo-patchset-0.tar.gz 9352 RMD160 475bdba037ca93062a96092bc049bf4f6659ca99 SHA1 6d614541b3c4760910f263cc6e57e09697e324db SHA256 1c1323602a30d734b298521a1749d2a25196b290d416b51f8ce512321d0f7df6
-DIST mercury-10.04.2-gentoo-patchset-1.tar.gz 8605 RMD160 c130dbd2c7a188fc062c5a18cc890677169c3b8a SHA1 fa5aaf379d8a700101cb502eb296291c0000c3c4 SHA256 4c19f536983b205b27507e7ee7a93ad31bcda9a1d027f3efdd09c9ace4d376ba
+DIST mercury-10.04.2-gentoo-patchset-2.tar.gz 9068 RMD160 f3b34fc1fa93771bfa0d3d5fa263a972c005e99d SHA1 914cbd1e8bfd3ac951a6589141c5de99546c0709 SHA256 ae19bf5f3c0537fe344cbbd28e115b77765e8e5d25d92abafdccc75583869814
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
 DIST mercury-compiler-10.04.1.tar.gz 24600120 RMD160 99f998845ad5c952860cd5ba3051c948dc7f3397 SHA1 9d9135d171128ce53cc77680423c5fd5e4ea4530 SHA256 63fa2b5661ab34bcb7d199c7686753c7c20b85b989c18e67f682f00cd91a02bb
 DIST mercury-compiler-10.04.2.tar.gz 24608706 RMD160 efcc35f8fcfaa66413bb04956e79a7708531327f SHA1 c1ade62620a6092f345c9c850abecfa8c69349e1 SHA256 cc7682971cb5377f69f2dbbf04cd3c7545ac98079e51dac92d71979d85fd01a8
@@ -24,8 +24,8 @@ DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
 EBUILD mercury-10.04-r1.ebuild 4058 RMD160 045040097513847a6959ef40121d8e6b81e6ae85 SHA1 f8746e3d5b738c5ed0079be878cb11393dfd96ca SHA256 ceb6d53b6f96c42b38e4bfbfee8f8dc71c098bb48aa13b4046d9264b9653641b
 EBUILD mercury-10.04.1.ebuild 4529 RMD160 91e2a1ddf874123394ae90431608525ae0a26f6c SHA1 273b09516ff839983613fbd526f6a7d12b2536c9 SHA256 8ae2505b6e5bcd624692c29cdba4963a8931b5e1b87ef4e5ac0b21a0a19e52eb
-EBUILD mercury-10.04.2-r1.ebuild 4940 RMD160 0473922485d6188e6ca85afe4e6d5a76e5b97a79 SHA1 689e3793d808f592b1ed8944baa0ffd9b72dd546 SHA256 83e9200ec17ce8a5a552cbcb3634d2fa9bb655197bd3fa37f1b88357beb0f329
+EBUILD mercury-10.04.2-r1.ebuild 5659 RMD160 94bfa228d2c506960d03f057e17aae516f900521 SHA1 2f7a9ccf8b5e42ae04c40759dd739c8631b11d52 SHA256 cea0a42a21974249ac13a243234cfe7d8676b2683aa3886803a38c59d68b19c7
 EBUILD mercury-10.04.2.ebuild 4529 RMD160 43477f989449a2fe794afb35df94855175bb7a0a SHA1 1e14fef6fbabaf466ca0237286978b281f0a2aee SHA256 e5ca10919d13cf82701d98a5a3acdf4c495238842d4b65eed87064a5ef86983a
 EBUILD mercury-10.04.ebuild 3857 RMD160 d9bb8e9e002d2f50b384c24733d64c6a02f7e4f6 SHA1 70aae9ae137fb35dacdcaf3541ec78b5f4c1ddaa SHA256 0133dfea517707ff1d1d2e9275a6051be07911d9b374cc91016ee166a94b5f20
-MISC ChangeLog 27969 RMD160 3906f8b11bc30e81f22264e9aaa6854199d5bc81 SHA1 d6720002e46570bb3a7f8a0c90f35e368cbd34b0 SHA256 52bb9e419ec03aade99a0a109130771664120eb97ec02754cdf3f441b501f982
+MISC ChangeLog 28142 RMD160 920b4888a54adecc24fcafa9365f5a8ae5092070 SHA1 3a636d66f2374389817ff1b58a1fadfc09fa36b5 SHA256 bf0ac68dacf9215eac9b276563176e2dcd44c3f3d090b53da9a837d809cac2ba
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild
index 430940e13e6b..b7796bf6f459 100644
--- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.5 2010/11/06 09:18:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.6 2010/11/06 20:58:43 keri Exp $
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
@@ -69,6 +69,15 @@ src_compile() {
 
 	econf ${myconf}
 
+	# Generate Mercury .m dependencies. This step will vacuously
+	# succeed if we do not have a bootstrappable instance of mmc
+	# already installed. This step is required as mmc does not wait
+	# for all dependencies to be generated before compiling .m files.
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		bootstrap_depend || die "emake depend failed"
+
+	# Build Mercury using base llds grade
 	emake \
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \
@@ -76,6 +85,8 @@ src_compile() {
 		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
 		|| die "emake failed"
 
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}-mmc
@@ -85,6 +96,7 @@ src_compile() {
 		"${S}"/compiler/make.program_target.m \
 		|| die "sed libdir failed"
 
+	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \
@@ -93,6 +105,9 @@ src_compile() {
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		compiler || die "emake compiler failed"
 
+	# The default Mercury grade may not be the same as the grade used to
+	# compile the llds base grade. Since src_test() is run before
+	# src_install() we compile the default grade now
 	emake \
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \