| 1 |
keri 10/10/10 00:09:47 |
| 2 |
|
| 3 |
Modified: mercury-10.04.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Run mmake depend when bootstrapping mercury_compile |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 dev-lang/mercury/mercury-10.04.1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: mercury-10.04.1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- mercury-10.04.1.ebuild 12 Sep 2010 03:17:24 -0000 1.2 |
| 22 |
+++ mercury-10.04.1.ebuild 10 Oct 2010 00:09:47 -0000 1.3 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.2 2010/09/12 03:17:24 keri Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.3 2010/10/10 00:09:47 keri Exp $ |
| 28 |
|
| 29 |
-inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 30 |
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 31 |
|
| 32 |
MY_P=${PN}-compiler-${PV} |
| 33 |
|
| 34 |
@@ -36,6 +36,7 @@ |
| 35 |
|
| 36 |
epatch "${FILESDIR}"/${P}-multilib.patch |
| 37 |
epatch "${FILESDIR}"/${P}-linker-flags.patch |
| 38 |
+ epatch "${FILESDIR}"/${P}-bootstrap-depend.patch |
| 39 |
epatch "${FILESDIR}"/${P}-default-grade.patch |
| 40 |
epatch "${FILESDIR}"/${P}-boehm_gc.patch |
| 41 |
epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch |
| 42 |
@@ -65,6 +66,9 @@ |
| 43 |
epatch "${FILESDIR}"/${P}-tests-sandbox.patch |
| 44 |
epatch "${FILESDIR}"/${P}-tests-static-link.patch |
| 45 |
fi |
| 46 |
+ |
| 47 |
+ cd "${S}" |
| 48 |
+ eautoreconf |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
@@ -73,7 +77,6 @@ |
| 53 |
local myconf |
| 54 |
myconf="--libdir=/usr/$(get_libdir) \ |
| 55 |
--disable-gcc-back-end \ |
| 56 |
- --disable-aditi-back-end \ |
| 57 |
--disable-deep-profiler \ |
| 58 |
--disable-dotnet-grades \ |
| 59 |
$(use_enable erlang erlang-grade) \ |
| 60 |
@@ -86,6 +89,11 @@ |
| 61 |
econf \ |
| 62 |
${myconf} \ |
| 63 |
|| die "econf failed" |
| 64 |
+ |
| 65 |
+ emake \ |
| 66 |
+ PARALLEL=${MAKEOPTS} \ |
| 67 |
+ bootstrap_depend || die "emake depend failed" |
| 68 |
+ |
| 69 |
emake \ |
| 70 |
PARALLEL=${MAKEOPTS} \ |
| 71 |
EXTRA_MLFLAGS=--no-strip \ |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.117 dev-lang/mercury/ChangeLog |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.117&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.117&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.116&r2=1.117 |
| 80 |
|
| 81 |
Index: ChangeLog |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v |
| 84 |
retrieving revision 1.116 |
| 85 |
retrieving revision 1.117 |
| 86 |
diff -u -r1.116 -r1.117 |
| 87 |
--- ChangeLog 12 Sep 2010 03:17:24 -0000 1.116 |
| 88 |
+++ ChangeLog 10 Oct 2010 00:09:47 -0000 1.117 |
| 89 |
@@ -1,6 +1,13 @@ |
| 90 |
# ChangeLog for dev-lang/mercury |
| 91 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 92 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.116 2010/09/12 03:17:24 keri Exp $ |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.117 2010/10/10 00:09:47 keri Exp $ |
| 94 |
+ |
| 95 |
+ 09 Oct 2010; <keri@g.o> mercury-10.04.1.ebuild, |
| 96 |
+ +files/mercury-10.04.1-bootstrap-depend.patch, |
| 97 |
+ files/mercury-10.04.1-char-det-from-int.patch, |
| 98 |
+ files/mercury-10.04.1-sparc-llds-base-grade.patch, |
| 99 |
+ files/mercury-10.04.1-tests-workspace.patch: |
| 100 |
+ Run mmake depend when bootstrapping mercury_compile |
| 101 |
|
| 102 |
12 Sep 2010; <keri@g.o> mercury-10.04.1.ebuild, |
| 103 |
+files/mercury-10.04.1-char-det-from-int.patch: |
Archives