Generate dependencies on .mh files for both .o and .pic_o files. Bug #154523.

(Portage version: 2.1.2_rc1-r7)

5 files changed, 120 insertions, 5 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 51cfa39bbcfd..521bd0e0e6d3 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2006/11/10 05:48:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.64 2006/11/23 09:16:40 keri Exp $
+
+  23 Nov 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-pic_o-dependencies.patch,
+  +files/mercury-0.13.0-pic_o-dependencies.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.13.0.ebuild:
+  Generate dependencies on .mh files for both .o and .pic_o files. Reported by
+  M. Edward Borasky <znmeb@cesmail.net> in #154523.
 
   10 Nov 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
   Generate _init.c files after all C files have been generated.
diff --git a/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch b/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch
new file mode 100644
index 000000000000..81f9e90ac765
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch
@@ -0,0 +1,45 @@
+--- mercury-compiler-0.12.2.orig/compiler/modules.m	2006-01-18 18:37:38.000000000 +1300
++++ mercury-compiler-0.12.2/compiler/modules.m	2006-11-23 20:26:45.000000000 +1300
+@@ -3326,27 +3326,32 @@
+             ForeignImportedModules = [_ | _],
+             (
+                 Target = il,
+-                ForeignImportTarget = DllFileName,
++                ForeignImportTargets = [DllFileName],
+                 ForeignImportExt = ".dll"
+             ;
+                 Target = java,
+-                ForeignImportTarget = ClassFileName,
++                ForeignImportTargets = [ClassFileName],
+                 ForeignImportExt = ".java"
+             ;
+                 Target = c,
+-                ForeignImportTarget = ObjFileName,
++                ForeignImportTargets = [ObjFileName, PicObjFileName],
+                 ForeignImportExt = ".mh"
+             ;
+                 Target = asm,
+-                ForeignImportTarget = ObjFileName,
++                ForeignImportTargets = [ObjFileName, PicObjFileName],
+                 ForeignImportExt = ".mh"
+             ),
+-            io__write_string(DepStream, "\n\n", !IO),
+-            io__write_string(DepStream, ForeignImportTarget, !IO),
+-            io__write_string(DepStream, " : ", !IO),
+-            write_dependencies_list(ForeignImportedModules, ForeignImportExt,
+-                DepStream, !IO),
+-            io__write_string(DepStream, "\n\n", !IO)
++            WriteForeignImportTarget = (pred(ForeignImportTarget::in,
++                    !.IO::di, !:IO::uo) is det :-
++                io__write_string(DepStream, "\n\n", !IO),
++                io__write_string(DepStream, ForeignImportTarget, !IO),
++                io__write_string(DepStream, " : ", !IO),
++                write_dependencies_list(ForeignImportedModules,
++                    ForeignImportExt, DepStream, !IO),
++                io__write_string(DepStream, "\n\n", !IO)
++            ),
++            list.foldl(WriteForeignImportTarget, ForeignImportTargets,
++                !IO)
+         ),
+ 
+         (
diff --git a/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch b/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch
new file mode 100644
index 000000000000..c14c4ea63efb
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch
@@ -0,0 +1,63 @@
+--- mercury-compiler-0.13.0.orig/compiler/modules.m	2006-05-23 18:46:52.000000000 +1200
++++ mercury-compiler-0.13.0/compiler/modules.m	2006-11-23 21:45:11.000000000 +1300
+@@ -3384,27 +3384,32 @@
+             ForeignImportedModules = [_ | _],
+             (
+                 Target = il,
+-                ForeignImportTarget = DllFileName,
++                ForeignImportTargets = [DllFileName],
+                 ForeignImportExt = ".dll"
+             ;
+                 Target = java,
+-                ForeignImportTarget = ClassFileName,
++                ForeignImportTargets = [ClassFileName],
+                 ForeignImportExt = ".java"
+             ;
+                 Target = c,
+-                ForeignImportTarget = ObjFileName,
++                ForeignImportTargets = [ObjFileName, PicObjFileName],
+                 ForeignImportExt = ".mh"
+             ;
+                 Target = asm,
+-                ForeignImportTarget = ObjFileName,
++                ForeignImportTargets = [ObjFileName, PicObjFileName],
+                 ForeignImportExt = ".mh"
+             ),
+-            io.write_string(DepStream, "\n\n", !IO),
+-            io.write_string(DepStream, ForeignImportTarget, !IO),
+-            io.write_string(DepStream, " : ", !IO),
+-            write_dependencies_list(ForeignImportedModules, ForeignImportExt,
+-                DepStream, !IO),
+-            io.write_string(DepStream, "\n\n", !IO)
++            WriteForeignImportTarget = (pred(ForeignImportTarget::in,
++                    !.IO::di, !:IO::uo) is det :-
++                io.write_string(DepStream, "\n\n", !IO),
++                io.write_string(DepStream, ForeignImportTarget, !IO),
++                io.write_string(DepStream, " : ", !IO),
++                write_dependencies_list(ForeignImportedModules,
++                    ForeignImportExt, DepStream, !IO),
++                io.write_string(DepStream, "\n\n", !IO)
++            ),
++            list.foldl(WriteForeignImportTarget, ForeignImportTargets,
++                !IO)
+         ),
+ 
+         (
+@@ -5242,7 +5247,7 @@
+     module_name_to_file_name(ModuleName, ".dv", no, DvFileName, !IO),
+     
+     io.write_strings(DepStream, [
+-        InitFileName, " : ", DepFileName, "\n",
++        InitFileName, " : ", DepFileName, " $(", MakeVarName, ".cs)\n",
+         "\techo > ", InitFileName, "\n"
+     ], !IO),
+ 
+@@ -5266,7 +5271,7 @@
+     TmpInitCFileName = InitCFileName ++ ".tmp",
+     io.write_strings(DepStream, [
+         ForceC2InitTarget, " :\n\n",
+-        InitCFileName, " : ", ForceC2InitTarget, "\n",
++        InitCFileName, " : ", ForceC2InitTarget, " $(", MakeVarName, ".init_cs)\n",
+         "\t@$(C2INIT) $(ALL_GRADEFLAGS) $(ALL_C2INITFLAGS) ",
+             "--init-c-file ", TmpInitCFileName,
+             " $(", MakeVarName, ".init_cs) $(ALL_C2INITARGS)\n",
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index b5f5be534739..ce69eb388ae9 100644
--- 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.12 2006/10/23 03:13:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.13 2006/11/23 09:16:40 keri Exp $
 
 inherit eutils
 
@@ -65,6 +65,7 @@ src_compile() {
 
 	einfo "Performing stage 2 bootstrap"
 	cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
+	epatch "${FILESDIR}"/${P}-pic_o-dependencies.patch
 	econf \
 		${myconf} \
 		BOOTSTRAP_STAGE="2" \
diff --git a/dev-lang/mercury/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild
index cbb3e9bcbcbb..2fec75ed457d 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.10 2006/11/10 05:48:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.11 2006/11/23 09:16:40 keri Exp $
 
 inherit eutils
 
@@ -65,8 +65,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\":" \
-		-e "s:ForceC2InitTarget, \"\\\n\":ForceC2InitTarget, \" \$(\", MakeVarName, \"\.init_cs)\\\n\":" compiler/modules.m
+	epatch "${FILESDIR}"/${P}-pic_o-dependencies.patch
 	econf \
 		${myconf} \
 		BOOTSTRAP_STAGE="2" \