Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang
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
commite79865aec9d803033b3fc9229ca980214186980e (patch)
tree4cda73962fa4cb5bcd1359832ca5a01868e7340c /dev-lang
parentLastrite GTK+-1.2 consumers: smurf, swami, soundtracker and surf. (diff)
downloadhistorical-e79865aec9d803033b3fc9229ca980214186980e.tar.gz
historical-e79865aec9d803033b3fc9229ca980214186980e.tar.bz2
historical-e79865aec9d803033b3fc9229ca980214186980e.zip
Compile default-grade after default llds grade in case default llds grade != default grade (used in testsuite)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury/ChangeLog9
-rw-r--r--dev-lang/mercury/Manifest6
-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
4 files changed, 56 insertions, 56 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/Manifest b/dev-lang/mercury/Manifest
index 1b5bc75e3e05..b2d4a2281fe0 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -10,8 +10,8 @@ AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c061
AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d918e42c9c3e95122c5 SHA1 fb78eba72aae7de933951941f6db890548e298b0 SHA256 a0a3f1a5d9d75443d9f442925eb15131b7bfbe3c92f737a51f1340111b46a34e
AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
AUX mercury-10.04-boehm_gc.patch 5908 RMD160 08ce24e7df84974b9c77ead866a3b10738b35132 SHA1 822914bf2116d2227097fa725705cd2ec5d4c55d SHA256 5cd45f249b6c0dd74b43f4c2e4237184da722e0a25941f3070804e56418a5467
+AUX mercury-10.04-default-grade.patch 9201 RMD160 e4a68ccedf91d6fa366a819b54270c13cf44bca2 SHA1 12f510d62530506c2df6d21cfb36b4840fbb7621 SHA256 678a6ce56acd14ea40e834bee6165022600582b1a965682107a99389c5d071c7
AUX mercury-10.04-docs.patch 1071 RMD160 7227e1c079b269f332081b956e53b85358d72a70 SHA1 f27b48ecb5ba991261f93c2c8d640b7fd213830b SHA256 a4514f76a7174d16f392e3f9aa55d19a468f114541cf93129908feeaec462c06
-AUX mercury-10.04-libgrades.patch 9440 RMD160 7f8d14f4a79145d7a2dcd0d5bee01f94671524c2 SHA1 99668480396eb81fa0aa1d9dccb8c63f8ff24ba2 SHA256 fd4a593268d7213bfb2bddc02ca6b5c9edd70a42aaa4a040ad8b570c851a6397
AUX mercury-10.04-multilib.patch 5993 RMD160 70cf37287f8a352eb09f66c402ea0e6690dd26be SHA1 1f0b47f3bfab7ffe54c487bde1c84e0499bca2f0 SHA256 43497f32f110e064bedae7b2aeaef63fc6b394276d7aa7e46864c97781de4db3
AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4ea21c7 SHA1 a4166eaf922e6423ff8761f486691f5b75fc14f9 SHA256 3b4dc9724fe9baed3222e43d86d3af73692d0f3f7285f6b6dbd4df0407690921
AUX mercury-10.04-tests-mercury-float.patch 2056 RMD160 0eeda80258e9e675be1866d42428618efa1cc2f9 SHA1 d69de5c6e94601e49c4e4d459996e0fa5fda996e SHA256 79f6b92ea2d37d3c0b8147497a110266278a193fcee825270c2217c1d44aa4a1
@@ -33,7 +33,7 @@ DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07
DIST mercury-tests-10.04-beta.tar.gz 5876463 RMD160 b29179ae78b1dcb0619684228abac0d6cd4471a8 SHA1 3fed8b5fbe840e844df725f386a08836825d48da SHA256 4c1bf8eece8f95fdf13eeaef8dc5ea4fee30646d20fed684fe6eb710d5234833
DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
-EBUILD mercury-10.04.ebuild 4031 RMD160 d8dc15539f84d5a5f5d423dcd69e2557bf97c5d7 SHA1 3f7eea84ad04c35e605a5d44e485a58140a9eff9 SHA256 767fec41c694461401df859d45066df13bd113d903b4153036d5808e390d3a06
+EBUILD mercury-10.04.ebuild 4043 RMD160 87d816db922a75d6ec23b45bf09c05bce43ce1e6 SHA1 43c868bb150e3a289fc4fdf96213f45d731655b9 SHA256 38a906fb94efdf0f21dd45fd13330b14ee72697c0a5bb429633b264f75a75805
EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 22011 RMD160 b2a006856b397efe899380643b232ba2a5aece1f SHA1 7be7aa7073eae33b81a4975e6e9fbe9c514f6c98 SHA256 77314da31ef680c41ebb3bfdba072177a460bc2d25eab93d14f9353324b66a6f
+MISC ChangeLog 22369 RMD160 553f37bb9a355d9e1c16599830677a02fb4eeb13 SHA1 2c5e08013d045b6ac618ae4b87dce55902381fce SHA256 50851c1c49b0c36ebf25e00652c0efdb440324cb3f2b4a4c13d613d7a226e224
MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
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() {