summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-09-12 03:17:24 +0000
committerKeri Harris <keri@gentoo.org>2010-09-12 03:17:24 +0000
commit8a851476cb76837450cd406bfacbf6edcd436a03 (patch)
tree915dc83f88355027cc41fc41bc0e930ef1bf2a78 /dev-lang
parentRespect LDFLAGS. Closes #334575 (diff)
downloadgentoo-2-8a851476cb76837450cd406bfacbf6edcd436a03.tar.gz
gentoo-2-8a851476cb76837450cd406bfacbf6edcd436a03.tar.bz2
gentoo-2-8a851476cb76837450cd406bfacbf6edcd436a03.zip
Test char.det_from_char() when checking for bootstrappable mmc
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury/ChangeLog6
-rw-r--r--dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch12
-rw-r--r--dev-lang/mercury/mercury-10.04.1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 90526506b875..ffe9974d201d 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.115 2010/09/05 05:48:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.116 2010/09/12 03:17:24 keri Exp $
+
+ 12 Sep 2010; <keri@gentoo.org> mercury-10.04.1.ebuild,
+ +files/mercury-10.04.1-char-det-from-int.patch:
+ Test char.det_from_char() when checking for bootstrappable mmc
*mercury-10.04.1 (05 Sep 2010)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
new file mode 100644
index 000000000000..6440854baf8d
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
@@ -0,0 +1,12 @@
+--- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
++++ mercury-compiler-10.04.1/configure 2010-09-12 12:59:51.000000000 +1200
+@@ -3412,7 +3412,8 @@
+ Version >= 8,
+ ac(2) ^ elem(3, 5) = 17,
+ (1 .. 2) = [1, 2],
+- Global = 561
++ Global = 561,
++ char.det_from_int(255) = '\xFF\'
+ ->
+ trace [io(!S)] (
+ io.print("Hello, world\n", !S)
diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild
index 1bf5b643cdc1..2b0e1de3eab2 100644
--- a/dev-lang/mercury/mercury-10.04.1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.1.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.1.ebuild,v 1.1 2010/09/05 05:48:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.2 2010/09/12 03:17:24 keri Exp $
inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
@@ -39,6 +39,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-default-grade.patch
epatch "${FILESDIR}"/${P}-boehm_gc.patch
epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
+ epatch "${FILESDIR}"/${P}-char-det-from-int.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-reconf.patch