diff options
author | Keri Harris <keri@gentoo.org> | 2010-07-25 18:51:58 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2010-07-25 18:51:58 +0000 |
commit | 974255557713403fd62fc7ec10a7144abd4edf5c (patch) | |
tree | 16f36a8cedb32d4861ba8f6a193d81062d3a1658 /dev-lang/mercury/files | |
parent | Lastrite GTK+-1.2 consumers: smurf, swami, soundtracker and surf. (diff) | |
download | gentoo-2-974255557713403fd62fc7ec10a7144abd4edf5c.tar.gz gentoo-2-974255557713403fd62fc7ec10a7144abd4edf5c.tar.bz2 gentoo-2-974255557713403fd62fc7ec10a7144abd4edf5c.zip |
Compile default-grade after default llds grade in case default llds grade != default grade (used in testsuite)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury/files')
-rw-r--r-- | dev-lang/mercury/files/mercury-10.04-default-grade.patch (renamed from dev-lang/mercury/files/mercury-10.04-libgrades.patch) | 91 |
1 files changed, 42 insertions, 49 deletions
diff --git a/dev-lang/mercury/files/mercury-10.04-libgrades.patch b/dev-lang/mercury/files/mercury-10.04-default-grade.patch index ed63fbc6a65c..c612845c53d0 100644 --- a/dev-lang/mercury/files/mercury-10.04-libgrades.patch +++ b/dev-lang/mercury/files/mercury-10.04-default-grade.patch @@ -11,58 +11,51 @@ diff -ur mercury-compiler-10.04.orig/Makefile mercury-compiler-10.04/Makefile #-----------------------------------------------------------------------------# diff -ur mercury-compiler-10.04.orig/Mmakefile mercury-compiler-10.04/Mmakefile --- mercury-compiler-10.04.orig/Mmakefile 2009-10-20 17:07:24.000000000 +1300 -+++ mercury-compiler-10.04/Mmakefile 2010-07-25 20:05:55.000000000 +1200 -@@ -286,6 +286,54 @@ ++++ mercury-compiler-10.04/Mmakefile 2010-07-25 21:18:31.000000000 +1200 +@@ -286,6 +286,47 @@ mdbcomp browser ssdb trace +cd deep_profiler && $(SUBDIR_MMAKE) -+.PHONY: libgrades -+libgrades: -+ +for grade in x $(LIBGRADES); do \ -+ if [ "$${grade}" = "x" -o "$${grade}" = "$(GRADE)" ]; then \ -+ continue; \ -+ fi; \ -+ case $${grade} in \ -+ java*|erlang*) continue; \ -+ esac; \ -+ gc_grade=`scripts/ml --grade $${grade} --print-gc-grade`; \ -+ IWS=`/bin/pwd`/install_grade_dir.$${grade}; \ -+ ( \ -+ scripts/prepare_install_dir $${IWS} && \ -+ ( cd $${IWS}/boehm_gc && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ GC_GRADE=$${gc_grade} libgrade ) && \ -+ ( cd $${IWS}/runtime && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ ( cd $${IWS}/library && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ ( cd $${IWS}/mdbcomp && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ ( cd $${IWS}/browser && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ ( cd $${IWS}/ssdb && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ ( cd $${IWS}/trace && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS} \ -+ libgrade ) && \ -+ true \ -+ ) || \ -+ { echo "To clean up from failed install, remove $${IWS}"; \ -+ exit 1; }; \ -+ done; ++.PHONY: default_grade ++default_grade: ++ +if test "$(DEFAULT_GRADE)" != "$(GRADE)"; then \ ++ gc_grade=`scripts/ml --grade $(DEFAULT_GRADE) --print-gc-grade`; \ ++ IWS=`/bin/pwd`/install_grade_dir.$(DEFAULT_GRADE); \ ++ ( \ ++ scripts/prepare_install_dir $${IWS} && \ ++ ( cd $${IWS}/boehm_gc && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ GC_GRADE=$${gc_grade} libgrade ) && \ ++ ( cd $${IWS}/runtime && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ ( cd $${IWS}/library && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ ( cd $${IWS}/mdbcomp && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ ( cd $${IWS}/browser && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ ( cd $${IWS}/ssdb && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ ( cd $${IWS}/trace && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \ ++ libgrade ) && \ ++ true \ ++ ) || \ ++ { exit 1; }; \ ++ fi; + #-----------------------------------------------------------------------------# |