| 1 |
keri 10/11/06 20:58:43 |
| 2 |
|
| 3 |
Modified: ChangeLog mercury-10.04.2-r1.ebuild |
| 4 |
Log: |
| 5 |
Add bootstrap_depend step to stop race condition in mmc dependency generation; document src_compile() steps |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.128 dev-lang/mercury/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.128&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.128&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.127&r2=1.128 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v |
| 18 |
retrieving revision 1.127 |
| 19 |
retrieving revision 1.128 |
| 20 |
diff -u -r1.127 -r1.128 |
| 21 |
--- ChangeLog 6 Nov 2010 09:18:00 -0000 1.127 |
| 22 |
+++ ChangeLog 6 Nov 2010 20:58:43 -0000 1.128 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-lang/mercury |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.127 2010/11/06 09:18:00 keri Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.128 2010/11/06 20:58:43 keri Exp $ |
| 28 |
+ |
| 29 |
+ 06 Nov 2010; <keri@g.o> mercury-10.04.2-r1.ebuild: |
| 30 |
+ Add bootstrap_depend step to stop race condition in mmc dependency |
| 31 |
+ generation; document src_compile() steps |
| 32 |
|
| 33 |
06 Nov 2010; <keri@g.o> mercury-10.04.2-r1.ebuild: |
| 34 |
Use 2-pass mercury_compiler bootstrap to allow patching .m files; closes |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.6 dev-lang/mercury/mercury-10.04.2-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.6&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.6&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?r1=1.5&r2=1.6 |
| 43 |
|
| 44 |
Index: mercury-10.04.2-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v |
| 47 |
retrieving revision 1.5 |
| 48 |
retrieving revision 1.6 |
| 49 |
diff -u -r1.5 -r1.6 |
| 50 |
--- mercury-10.04.2-r1.ebuild 6 Nov 2010 09:18:00 -0000 1.5 |
| 51 |
+++ mercury-10.04.2-r1.ebuild 6 Nov 2010 20:58:43 -0000 1.6 |
| 52 |
@@ -1,10 +1,10 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 59 |
|
| 60 |
-PATCHSET_VER="1" |
| 61 |
+PATCHSET_VER="2" |
| 62 |
MY_P=${PN}-compiler-${PV} |
| 63 |
|
| 64 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 65 |
@@ -69,6 +69,15 @@ |
| 66 |
|
| 67 |
econf ${myconf} |
| 68 |
|
| 69 |
+ # Generate Mercury .m dependencies. This step will vacuously |
| 70 |
+ # succeed if we do not have a bootstrappable instance of mmc |
| 71 |
+ # already installed. This step is required as mmc does not wait |
| 72 |
+ # for all dependencies to be generated before compiling .m files. |
| 73 |
+ emake \ |
| 74 |
+ PARALLEL=${MAKEOPTS} \ |
| 75 |
+ bootstrap_depend || die "emake depend failed" |
| 76 |
+ |
| 77 |
+ # Build Mercury using base llds grade |
| 78 |
emake \ |
| 79 |
PARALLEL=${MAKEOPTS} \ |
| 80 |
EXTRA_MLFLAGS=--no-strip \ |
| 81 |
@@ -76,6 +85,8 @@ |
| 82 |
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ |
| 83 |
|| die "emake failed" |
| 84 |
|
| 85 |
+ # We can now patch .m Mercury compiler files since we |
| 86 |
+ # have just built mercury_compiler. |
| 87 |
EPATCH_FORCE=yes |
| 88 |
EPATCH_SUFFIX=patch |
| 89 |
epatch "${WORKDIR}"/${PV}-mmc |
| 90 |
@@ -85,6 +96,7 @@ |
| 91 |
"${S}"/compiler/make.program_target.m \ |
| 92 |
|| die "sed libdir failed" |
| 93 |
|
| 94 |
+ # Rebuild Mercury compiler using the just built mercury_compiler |
| 95 |
emake \ |
| 96 |
PARALLEL=${MAKEOPTS} \ |
| 97 |
EXTRA_MLFLAGS=--no-strip \ |
| 98 |
@@ -93,6 +105,9 @@ |
| 99 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 100 |
compiler || die "emake compiler failed" |
| 101 |
|
| 102 |
+ # The default Mercury grade may not be the same as the grade used to |
| 103 |
+ # compile the llds base grade. Since src_test() is run before |
| 104 |
+ # src_install() we compile the default grade now |
| 105 |
emake \ |
| 106 |
PARALLEL=${MAKEOPTS} \ |
| 107 |
EXTRA_MLFLAGS=--no-strip \ |
Archives