diff options
author | Keri Harris <keri@gentoo.org> | 2006-09-16 01:09:09 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-09-16 01:09:09 +0000 |
commit | 48e78fd893ad4de82482e455e2993257a190dfcb (patch) | |
tree | 5d712041ed741279922de53df5b0de67ac33ee56 /dev-lang/mercury/files/mercury-0.13.0-libgrades.patch | |
parent | version bump as per bug #143337 (diff) | |
download | historical-48e78fd893ad4de82482e455e2993257a190dfcb.tar.gz historical-48e78fd893ad4de82482e455e2993257a190dfcb.tar.bz2 historical-48e78fd893ad4de82482e455e2993257a190dfcb.zip |
Version bump.
Package-Manager: portage-2.1.1
Diffstat (limited to 'dev-lang/mercury/files/mercury-0.13.0-libgrades.patch')
-rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-libgrades.patch | 251 |
1 files changed, 251 insertions, 0 deletions
diff --git a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch new file mode 100644 index 000000000000..fe027c4d083d --- /dev/null +++ b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch @@ -0,0 +1,251 @@ +--- mercury-compiler-0.13.0.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 ++++ mercury-compiler-0.13.0/Mmakefile 2006-09-16 11:58:30.000000000 +1200 +@@ -281,6 +281,54 @@ + mdbcomp browser trace + +cd deep_profiler && $(SUBDIR_MMAKE) + ++libgrades: ++ +for grade in x $(LIBGRADES); do \ ++ if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ ++ gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ ++ TWS=`/bin/pwd`/libgrades/$$grade; \ ++ /bin/rm -fr libgrades/$$grade; \ ++ mkdir -p libgrades/$$grade; \ ++ ( scripts/prepare_tmp_dir_fixed_part $$grade && \ ++ scripts/prepare_tmp_dir_grade_part $$grade ) && \ ++ ( cd libgrades/$$grade/boehm_gc && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ ++ WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/runtime && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/library && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/mdbcomp && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/browser && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/trace && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ true || \ ++ exit 1; \ ++ fi; \ ++ done ++ + #-----------------------------------------------------------------------------# + + .PHONY: tags +@@ -483,28 +531,13 @@ + @echo + @echo "-- Installation complete." + @echo +- @echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH," +- @echo "-- $(INSTALL_MAN_DIR) to your MANPATH," +- @echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH," +- @if test $(ENABLE_DEEP_PROFILER) != yes || \ +- cmp -s deep_profiler/mdprof_cgi \ +- $(INSTALL_CGI_DIR)/mdprof_cgi; \ +- then true ; else \ +- echo "-- to copy deep_profiler/mdprof_cgi" \ +- "to $(INSTALL_CGI_DIR),"; \ +- fi +- @echo "-- and to add the following lines to the \`.emacs' file" +- @echo "-- in your home directory:" +- @echo " (setq load-path (cons (expand-file-name " +- @echo " \"$(INSTALL_ELISP_DIR)\") load-path))" +- @echo " (autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)" + + .PHONY: install_main + install_main: all \ + install_scripts install_util install_runtime install_boehm_gc \ + install_library install_mdbcomp install_browser install_trace \ + install_compiler install_slice install_profiler \ +- install_deep_profiler install_doc install_config ++ install_deep_profiler install_doc + + .PHONY: install_scripts + install_scripts: scripts +@@ -569,7 +602,7 @@ + # .trans_opt .trans_opt_date .d .mh .mih .c_date .c .o .pic_o + + .PHONY: install_grades +-install_grades: all ++install_grades: all libgrades + # + # Use the newly installed compiler to build the libraries + # in various different grades. We need to override MC=mmc +@@ -577,44 +610,33 @@ + # runs the newly installed compiler, rather than using the + # bootstrap compiler. + # +- /bin/rm -fr tmp_dir +- scripts/prepare_tmp_dir_fixed_part + +for grade in x $(LIBGRADES); do \ + if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ + gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ +- TWS=`/bin/pwd`/tmp_dir; \ +- scripts/prepare_tmp_dir_grade_part; \ +- ( cd tmp_dir/boehm_gc && \ ++ TWS=`/bin/pwd`/libgrades/$$grade; \ ++ ( cd libgrades/$$grade/boehm_gc && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ + WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ + install_lib ) && \ +- ( cd tmp_dir/runtime && \ ++ ( cd libgrades/$$grade/runtime && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_lib ) && \ +- ( cd tmp_dir/library && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/library && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/mdbcomp && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/mdbcomp && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/browser && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/browser && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/trace && \ ++ ( cd libgrades/$$grade/trace && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_lib ) && \ + true || \ +- { echo "To clean up from failed install, remove tmp_dir"; \ +- exit 1; }; \ ++ exit 1; \ + fi; \ + done +- if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi + + .PHONY: install_split_library + install_split_library: scripts dep_library +--- mercury-compiler-0.13.0.orig/boehm_gc/Mmakefile 2004-10-19 19:01:36.000000000 +1300 ++++ mercury-compiler-0.13.0/boehm_gc/Mmakefile 2006-09-16 12:01:01.000000000 +1200 +@@ -90,6 +90,9 @@ + .PHONY: force + force: + ++.PHONY: libgrade ++libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules +--- mercury-compiler-0.13.0.orig/browser/Mmakefile 2005-12-16 18:49:31.000000000 +1300 ++++ mercury-compiler-0.13.0/browser/Mmakefile 2006-09-16 12:18:39.000000000 +1200 +@@ -186,6 +186,11 @@ + .PHONY: int3s + int3s: $(INT3S_TARGETS) + ++.PHONY: libgrade ++libgrade: \ ++ lib$(BROWSER_LIB_NAME).$A \ ++ lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(BROWSER_LIB_NAME).ms) +--- mercury-compiler-0.13.0.orig/library/Mmakefile 2006-01-10 18:30:36.000000000 +1300 ++++ mercury-compiler-0.13.0/library/Mmakefile 2006-09-16 12:20:37.000000000 +1200 +@@ -196,6 +196,9 @@ + trans_opts: $(STD_LIB_NAME).trans_opts + $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts) + ++.PHONY: libgrade ++libgrade: lib$(STD_LIB_NAME) ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(STD_LIB_NAME).ms) +--- mercury-compiler-0.13.0.orig/mdbcomp/Mmakefile 2005-12-16 18:49:40.000000000 +1300 ++++ mercury-compiler-0.13.0/mdbcomp/Mmakefile 2006-09-16 12:22:14.000000000 +1200 +@@ -150,6 +150,13 @@ + .PHONY: int3s + int3s: $(INT3S_TARGETS) + ++.PHONY: libgrade ++libgrade: \ ++ $(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \ ++ lib$(MDBCOMP_LIB_NAME).$A \ ++ lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \ ++ all-ints ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(MDBCOMP_LIB_NAME).ms) +--- mercury-compiler-0.13.0.orig/runtime/Mmakefile 2006-03-30 18:13:48.000000000 +1200 ++++ mercury-compiler-0.13.0/runtime/Mmakefile 2006-09-16 12:23:46.000000000 +1200 +@@ -420,6 +420,9 @@ + @if test ! -f tags; then echo making tags; \ + ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi + ++.PHONY: libgrade ++libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules +--- mercury-compiler-0.13.0.orig/scripts/prepare_tmp_dir_fixed_part.in 2005-01-28 20:11:59.000000000 +1300 ++++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_fixed_part.in 2006-09-16 12:28:36.000000000 +1200 +@@ -12,7 +12,9 @@ + fi + wd=`/bin/pwd` + +-mkdir tmp_dir ++tmp_dir=libgrades/$1 ++ ++mkdir -p tmp_dir + cp Mmake* tmp_dir + cp Mercury.* tmp_dir + cp VERSION tmp_dir +--- mercury-compiler-0.13.0.orig/scripts/prepare_tmp_dir_grade_part 2005-05-20 18:15:20.000000000 +1200 ++++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_grade_part 2006-09-16 12:30:47.000000000 +1200 +@@ -5,6 +5,8 @@ + # Public License - see the file COPYING in the Mercury distribution. + #---------------------------------------------------------------------------# + ++tmp_dir=libgrades/$1 ++ + rm -fr tmp_dir/boehm_gc + rm -fr tmp_dir/runtime + rm -fr tmp_dir/trace +--- mercury-compiler-0.13.0.orig/trace/Mmakefile 2006-04-04 19:42:03.000000000 +1200 ++++ mercury-compiler-0.13.0/trace/Mmakefile 2006-09-16 12:25:49.000000000 +1200 +@@ -204,6 +204,9 @@ + @if test ! -f tags; then echo making tags; \ + ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi + ++.PHONY: libgrade ++libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules |