Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-07-25 18:51:58 +0000
committerKeri Harris <keri@gentoo.org>2010-07-25 18:51:58 +0000
commit974255557713403fd62fc7ec10a7144abd4edf5c (patch)
tree16f36a8cedb32d4861ba8f6a193d81062d3a1658
parentLastrite GTK+-1.2 consumers: smurf, swami, soundtracker and surf. (diff)
downloadgentoo-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
-rw-r--r--dev-lang/mercury/ChangeLog9
-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
-rw-r--r--dev-lang/mercury/mercury-10.04.ebuild6
3 files changed, 53 insertions, 53 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 129e5a44feae..4b4260f0df90 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.109 2010/07/25 08:45:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.110 2010/07/25 18:51:57 keri Exp $
+
+ 25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+ +files/mercury-10.04-default-grade.patch,
+ -files/mercury-10.04-libgrades.patch:
+ Compile default-grade after default llds grade in case default llds grade
+ != default grade (used in testsuite). Only default-grade and default llds
+ grade are needed prior to running src_test() and src_install().
25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+files/mercury-10.04-libgrades.patch:
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;
+
#-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
index ac4091ade649..8fb052489b58 100644
--- a/dev-lang/mercury/mercury-10.04.ebuild
+++ b/dev-lang/mercury/mercury-10.04.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.3 2010/07/25 08:45:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.4 2010/07/25 18:51:57 keri Exp $
inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
@@ -35,7 +35,7 @@ src_unpack() {
unpack ${A}
epatch "${FILESDIR}"/${P}-multilib.patch
- epatch "${FILESDIR}"/${P}-libgrades.patch
+ epatch "${FILESDIR}"/${P}-default-grade.patch
epatch "${FILESDIR}"/${P}-boehm_gc.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-reconf.patch
@@ -79,7 +79,7 @@ src_compile() {
PARALLEL=${MAKEOPTS} \
EXTRA_MLFLAGS=--no-strip \
MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- libgrades || die "emake libgrades failed"
+ default_grade || die "emake default_grade failed"
}
src_test() {