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

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 51cfa39bbcfdfb67423bb3c74a9cb57200dd3b40..521bd0e0e6d3b6ca4cc9915f2d6ca6e7f21c5163 100644 (file)
--- 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/Manifest b/dev-lang/mercury/Manifest
index dfecb5c305d2a23740c3fcf39aa9d3c1bb224f92..cb5de38ed3c92fbdf231a3a0f6bd9632a356e442 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -30,6 +30,10 @@ AUX mercury-0.12.2-parallel-install_grades.patch 633 RMD160 0a72929eae70dce478a0
 MD5 b933cb0e2cd26859533c52bacbc4b7c1 files/mercury-0.12.2-parallel-install_grades.patch 633
 RMD160 0a72929eae70dce478a02898049abb4c7d63ddab files/mercury-0.12.2-parallel-install_grades.patch 633
 SHA256 ecf22afde46cfc249ce9269453cb606d6fdee11cb074667e08423a165554fd3e files/mercury-0.12.2-parallel-install_grades.patch 633
+AUX mercury-0.12.2-pic_o-dependencies.patch 2044 RMD160 f2f6fa26db16799e091dd73965fb4333ecf971d8 SHA1 691a3082570dc8894ed1d060c94c549d60129d66 SHA256 e11f0fb8e2f43dab2c45a4f7f8348894d64d16f0ea2d3bb3cec4203b74fe89b0
+MD5 fb186fbe6050922ef3c661785b25cffc files/mercury-0.12.2-pic_o-dependencies.patch 2044
+RMD160 f2f6fa26db16799e091dd73965fb4333ecf971d8 files/mercury-0.12.2-pic_o-dependencies.patch 2044
+SHA256 e11f0fb8e2f43dab2c45a4f7f8348894d64d16f0ea2d3bb3cec4203b74fe89b0 files/mercury-0.12.2-pic_o-dependencies.patch 2044
 AUX mercury-0.12.2-portage-r3.patch 3249 RMD160 f49a3e173a2dab1af7d4c79c1333394e99fe1926 SHA1 c66f94f7bed987b890ea2ecc66c56148e3d24c5c SHA256 1fa09fe1f88ba05e4f0408bc8dd121b6daddb95ad873171ae15bc070771d2634
 MD5 d3f01dd8c7dd87f6e398d43d85c683db files/mercury-0.12.2-portage-r3.patch 3249
 RMD160 f49a3e173a2dab1af7d4c79c1333394e99fe1926 files/mercury-0.12.2-portage-r3.patch 3249
@@ -70,6 +74,10 @@ AUX mercury-0.13.0-parallel-install_grades.patch 633 RMD160 c29c09ab486d5844267c
 MD5 19a002d59bfd65b6e582af78b2c6cbff files/mercury-0.13.0-parallel-install_grades.patch 633
 RMD160 c29c09ab486d5844267c7252e3ef7b7fe2e9400f files/mercury-0.13.0-parallel-install_grades.patch 633
 SHA256 b55252444d4e93d80879151490ed6f3f58b3db6185e6defc44a0cf0152cc06c1 files/mercury-0.13.0-parallel-install_grades.patch 633
+AUX mercury-0.13.0-pic_o-dependencies.patch 2812 RMD160 13eb8a0647c31a00981b88c7911bcfa2d963094b SHA1 fbee22ca0703378ac0da99522f4dbf569577bdea SHA256 375190a73f7e227e92676da91f0ce90d5fdb70c4d4227fc687ab7b8491eb1591
+MD5 bf059ec3d719d394425386adf0aebe48 files/mercury-0.13.0-pic_o-dependencies.patch 2812
+RMD160 13eb8a0647c31a00981b88c7911bcfa2d963094b files/mercury-0.13.0-pic_o-dependencies.patch 2812
+SHA256 375190a73f7e227e92676da91f0ce90d5fdb70c4d4227fc687ab7b8491eb1591 files/mercury-0.13.0-pic_o-dependencies.patch 2812
 AUX mercury-0.13.0-portage.patch 2891 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 SHA1 7ea86360ddfdd869640980fcfae78f933becc02e SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c
 MD5 c50f24a88e741f61d40a29cfa974607f files/mercury-0.13.0-portage.patch 2891
 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 files/mercury-0.13.0-portage.patch 2891
@@ -82,18 +90,18 @@ DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39e
 DIST mercury-compiler-0.13.0.tar.gz 15861463 RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b SHA1 7a9362225e1b51d7d1b342c39203ad0ef1b9f952 SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342
 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
 DIST mercury-tests-0.13.0.tar.gz 984910 RMD160 1b90b941488b9da57ff27ab1506b902b5fa5e170 SHA1 df5fa6725bb37fdba8085a441687bf056111e4e7 SHA256 227561407d63d177e6bfdf08d58481a9dcf6228d225ca2b67643c1af16cedc08
-EBUILD mercury-0.12.2-r3.ebuild 3398 RMD160 a3303b195b86b9a82bd5ae6ebae65b36f98d09e8 SHA1 925fa365e11f2f8dffeabdaacdd4791a95ba8ea3 SHA256 93306dd30e68d2fdee8c74df11fcd9fb6b445436120c28e9e8fb7c74aaf5516a
-MD5 29e38a5d52c9ba58e08151940a904a69 mercury-0.12.2-r3.ebuild 3398
-RMD160 a3303b195b86b9a82bd5ae6ebae65b36f98d09e8 mercury-0.12.2-r3.ebuild 3398
-SHA256 93306dd30e68d2fdee8c74df11fcd9fb6b445436120c28e9e8fb7c74aaf5516a mercury-0.12.2-r3.ebuild 3398
-EBUILD mercury-0.13.0.ebuild 3556 RMD160 d950c56cf63ee389034fde6012d8f103fa75fb6d SHA1 d2e4f51cd39bd5e7a47f1bd049554f0022bd4e56 SHA256 130a2ef55cbc72ac3013ad66b85006d6b3a69575df1c07dbf3e7a204d8841fa8
-MD5 bfcfde589494e2afe144433d31180fae mercury-0.13.0.ebuild 3556
-RMD160 d950c56cf63ee389034fde6012d8f103fa75fb6d mercury-0.13.0.ebuild 3556
-SHA256 130a2ef55cbc72ac3013ad66b85006d6b3a69575df1c07dbf3e7a204d8841fa8 mercury-0.13.0.ebuild 3556
-MISC ChangeLog 11384 RMD160 d4ae749465af4064b1a40f517600d01369046406 SHA1 5ec1dda3184ee1ba00474d70753004a4bfba11fa SHA256 c9b60e76123162763ecf64431ad483fe5e8e72641377510d9af0c23451cad5f9
-MD5 9eb8e35b8d82b162400e5e1c6eb43748 ChangeLog 11384
-RMD160 d4ae749465af4064b1a40f517600d01369046406 ChangeLog 11384
-SHA256 c9b60e76123162763ecf64431ad483fe5e8e72641377510d9af0c23451cad5f9 ChangeLog 11384
+EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 SHA1 01641c7d20d7900c7a9bac9b4141d5b6947988d5 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac
+MD5 181fbbca5d6184eafcf27c498245e199 mercury-0.12.2-r3.ebuild 3450
+RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 mercury-0.12.2-r3.ebuild 3450
+SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac mercury-0.12.2-r3.ebuild 3450
+EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a
+MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
+RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
+SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399
+MISC ChangeLog 11705 RMD160 a68771287ed8f7a8e8065d7a5032fbde027e96ef SHA1 f38e8efe3f5b3dee1b762304c6def21aac7ef9ef SHA256 fcfe3168a5bcfa34176e433345614dfb8fdb546bb970b1cdc6fd27e3a844c107
+MD5 698741fb4e23f98359cf4752760e58ec ChangeLog 11705
+RMD160 a68771287ed8f7a8e8065d7a5032fbde027e96ef ChangeLog 11705
+SHA256 fcfe3168a5bcfa34176e433345614dfb8fdb546bb970b1cdc6fd27e3a844c107 ChangeLog 11705
 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/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 (file)
index 0000000..81f9e90
--- /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 (file)
index 0000000..c14c4ea
--- /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 b5f5be534739a3d06ef5e9dceee8e13736bebe1c..ce69eb388ae9237d070f6990e72f91ef636eb759 100644 (file)
--- 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 cbb3e9bcbcbb016e8fabc6f4311b346dc4f47815..2fec75ed457d2e5eeac38c8e267ebf14458fa2a6 100644 (file)
--- 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" \