summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-07-26 07:30:20 +0000
committerKeri Harris <keri@gentoo.org>2010-07-26 07:30:20 +0000
commit3199b79f1d5f1c8a51be1f979ca78e7278e7498f (patch)
tree415aaf1546cbf4b55b5853a1475bac23eb4d80cf /dev-lang/mercury
parentRemove sci-geosciences/vis5d+ mask (diff)
downloadgentoo-2-3199b79f1d5f1c8a51be1f979ca78e7278e7498f.tar.gz
gentoo-2-3199b79f1d5f1c8a51be1f979ca78e7278e7498f.tar.bz2
gentoo-2-3199b79f1d5f1c8a51be1f979ca78e7278e7498f.zip
Specify llds-base-grade for sparc
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
-rw-r--r--dev-lang/mercury/ChangeLog6
-rw-r--r--dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch11
-rw-r--r--dev-lang/mercury/mercury-10.04.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 4b4260f0df90..d0c372602543 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
# 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.110 2010/07/25 18:51:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.111 2010/07/26 07:30:19 keri Exp $
+
+ 26 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+ +files/mercury-10.04-sparc-llds-base-grade.patch:
+ Specify llds-base-grade for sparc
25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+files/mercury-10.04-default-grade.patch,
diff --git a/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch b/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch
new file mode 100644
index 000000000000..8c766d5c5ecd
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-10.04.orig/configure 2010-07-18 20:40:26.000000000 +1200
++++ mercury-compiler-10.04/configure 2010-07-24 19:26:57.000000000 +1200
+@@ -10804,7 +10804,7 @@
+ # The asm_fast and reg grades also do not currently work on Linux/PPC.
+ #
+ case "$host" in
+- i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu)
++ i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu|sparc*-linux-gnu)
+ BEST_LLDS_BASE_GRADE=none
+ ;;
+ esac
diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
index 8fb052489b58..a88ac40cc5eb 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.4 2010/07/25 18:51:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.5 2010/07/26 07:30:20 keri Exp $
inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
@@ -36,6 +36,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-multilib.patch
epatch "${FILESDIR}"/${P}-default-grade.patch
+ epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
epatch "${FILESDIR}"/${P}-boehm_gc.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-reconf.patch