summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-10-14 22:06:10 +0000
committerKeri Harris <keri@gentoo.org>2006-10-14 22:06:10 +0000
commitecc49e53e86dc28478ec00abba807a01b2f3d5c3 (patch)
tree316af31f16088843972450be6d40ae08b4b19dbd
parentBlockers must be mutual. (diff)
downloadhistorical-ecc49e53e86dc28478ec00abba807a01b2f3d5c3.tar.gz
historical-ecc49e53e86dc28478ec00abba807a01b2f3d5c3.tar.bz2
historical-ecc49e53e86dc28478ec00abba807a01b2f3d5c3.zip
Add $(MakeVarName.cs) to InitFile target in dep files for stage2 bootstrap.
Package-Manager: portage-2.1.2_pre2-r9
-rw-r--r--dev-lang/mercury/ChangeLog5
-rw-r--r--dev-lang/mercury/Manifest16
-rw-r--r--dev-lang/mercury/mercury-0.13.0.ebuild4
3 files changed, 14 insertions, 11 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index d0cd7d577c39..590c9f761c58 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
# 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.54 2006/10/14 07:17:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.55 2006/10/14 22:06:10 keri Exp $
+
+ 14 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+ Add $(MakeVarName.cs) to InitFile target in dep files for stage2 bootstrap.
14 Oct 2006; keri <keri@gentoo.org> +files/mercury-0.13.0-mkinit.patch,
mercury-0.13.0.ebuild:
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index ae3577c6c4aa..861b9b5de2e3 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -106,14 +106,14 @@ EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb75
MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423
-EBUILD mercury-0.13.0.ebuild 3304 RMD160 e4fc494b32ad603fe329295f0726aaa415880c93 SHA1 a6a768c6b29c3e3cb7e67ce31031e41ade214d1f SHA256 402502823635094f5b60fe95cb8a0f9c23c37276c41d7ead2148a24fd24b6ff7
-MD5 2f9c89757339ee849a114ed0670027e4 mercury-0.13.0.ebuild 3304
-RMD160 e4fc494b32ad603fe329295f0726aaa415880c93 mercury-0.13.0.ebuild 3304
-SHA256 402502823635094f5b60fe95cb8a0f9c23c37276c41d7ead2148a24fd24b6ff7 mercury-0.13.0.ebuild 3304
-MISC ChangeLog 9957 RMD160 877d3ae8e516d6700c227ce83491ebff8f542193 SHA1 99b3c635b62395cc4a8a91a54fb5a102ed7e4461 SHA256 dd6f89e84668b466964f0b22f19f13611b6c844ba45848f204042c9b68ed2bac
-MD5 cc019db8626e51c5993be774e2842139 ChangeLog 9957
-RMD160 877d3ae8e516d6700c227ce83491ebff8f542193 ChangeLog 9957
-SHA256 dd6f89e84668b466964f0b22f19f13611b6c844ba45848f204042c9b68ed2bac ChangeLog 9957
+EBUILD mercury-0.13.0.ebuild 3371 RMD160 b3729307f1a62ad2de023a06e172707de7058b9e SHA1 906978f790917e14cba1c8aecccb605b3da3e2af SHA256 1b336539ff2ec7769421a85686a0abab33e5ab54d6f2947a0a03c7b6a41f9fed
+MD5 b03613966347f6371ae7fab57d650d86 mercury-0.13.0.ebuild 3371
+RMD160 b3729307f1a62ad2de023a06e172707de7058b9e mercury-0.13.0.ebuild 3371
+SHA256 1b336539ff2ec7769421a85686a0abab33e5ab54d6f2947a0a03c7b6a41f9fed mercury-0.13.0.ebuild 3371
+MISC ChangeLog 10097 RMD160 a686bf1a1d871e4a2a9f9680f5f4138bd722a3b5 SHA1 1649732c688dde4dbde535d99483eaed561c6036 SHA256 a39facd3a5b501bfba3e16a6a5abd3bc6e930dfe67233e2108b4372c29e5cf83
+MD5 2f94528d076cbead18b150354b8caae6 ChangeLog 10097
+RMD160 a686bf1a1d871e4a2a9f9680f5f4138bd722a3b5 ChangeLog 10097
+SHA256 a39facd3a5b501bfba3e16a6a5abd3bc6e930dfe67233e2108b4372c29e5cf83 ChangeLog 10097
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/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild
index f99044909b05..c4a92dfa9ec5 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.4 2006/10/14 07:17:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.5 2006/10/14 22:06:10 keri Exp $
inherit eutils
@@ -32,7 +32,6 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-bootstrap.patch
epatch "${FILESDIR}"/${P}-LIBDIR.patch
epatch "${FILESDIR}"/${P}-libgrades.patch
- epatch "${FILESDIR}"/${P}-mkinit.patch
epatch "${FILESDIR}"/${P}-deep_profiler.patch
epatch "${FILESDIR}"/${P}-docs.patch
@@ -65,6 +64,7 @@ src_compile() {
einfo "Performing stage 2 bootstrap"
cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
+ sed -i -e "s:DepFileName, \"\\\n\":DepFileName, \" \$(\", MakeVarName, \"\.cs)\\\n\":" compiler/modules.m
econf \
${myconf} \
BOOTSTRAP_STAGE="2" \