diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-11-23 09:16:40 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-11-23 09:16:40 +0000 |
| commit | e541da9bc1f93360f7e1aa0c4894e73d71b91c6d (patch) | |
| tree | c3dad82f7f3714329684563bc823f191e36915fd /dev-lang/mercury/files | |
| parent | stable x86, bug #153218; dropped keyword on 0.65 to force an upgrade (diff) | |
| download | gentoo-2-e541da9bc1f93360f7e1aa0c4894e73d71b91c6d.tar.gz gentoo-2-e541da9bc1f93360f7e1aa0c4894e73d71b91c6d.tar.bz2 gentoo-2-e541da9bc1f93360f7e1aa0c4894e73d71b91c6d.zip | |
Generate dependencies on .mh files for both .o and .pic_o files. Bug #154523.
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'dev-lang/mercury/files')
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch | 45 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch | 63 |
2 files changed, 108 insertions, 0 deletions
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", |