Unboxed float fix on stage1 bootstrap.

(Portage version: 2.1.2_rc4-r2)

5 files changed, 89 insertions, 3 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 2673a1195c41..1bf807db5db9 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.69 2007/01/07 03:09:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.70 2007/01/07 03:34:51 keri Exp $
+
+  07 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-unboxed_floats.patch,
+  +files/mercury-0.13.1-unboxed_floats.patch, mercury-0.12.2-r4.ebuild,
+  mercury-0.13.1-r1.ebuild:
+  Unboxed float fix on stage1 bootstrap.
 
   07 Jan 2007; keri <keri@gentoo.org>
   +files/mercury-0.13.1-tests-dir_test.patch,
diff --git a/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch b/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch
new file mode 100644
index 000000000000..b8e91b7d9d06
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch
@@ -0,0 +1,39 @@
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2007-01-07 16:19:08.000000000 +1300
+@@ -7232,21 +7232,21 @@
+ 
+ echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
+ echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
+-if test "$mercury_cv_unboxed_floats" = yes; then
+-	if test "$BOOTSTRAP_MC" = ""; then
+-		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
+-****	cannot use unboxed floats, bootstrapping using boxed floats
+-****	after installation is complete you may want to reinstall
+-****	from scratch so you can use unboxed floats, which are more
+-****	efficient." >&5
+-echo "$as_me: WARNING: Mercury compiler not yet installed -
+-****	cannot use unboxed floats, bootstrapping using boxed floats
+-****	after installation is complete you may want to reinstall
+-****	from scratch so you can use unboxed floats, which are more
+-****	efficient." >&2;}
+-		mercury_cv_unboxed_floats=no
+-	fi
+-fi
++#if test "$mercury_cv_unboxed_floats" = yes; then
++#	if test "$BOOTSTRAP_MC" = ""; then
++#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
++#****	cannot use unboxed floats, bootstrapping using boxed floats
++#****	after installation is complete you may want to reinstall
++#****	from scratch so you can use unboxed floats, which are more
++#****	efficient." >&5
++#echo "$as_me: WARNING: Mercury compiler not yet installed -
++#****	cannot use unboxed floats, bootstrapping using boxed floats
++#****	after installation is complete you may want to reinstall
++#****	from scratch so you can use unboxed floats, which are more
++#****	efficient." >&2;}
++#		mercury_cv_unboxed_floats=no
++#	fi
++#fi
+ if test "$mercury_cv_unboxed_floats" = yes; then
+ 	HAVE_BOXED_FLOATS="--unboxed-float"
+ else
diff --git a/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch b/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch
new file mode 100644
index 000000000000..13a68c2df81d
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch
@@ -0,0 +1,39 @@
+--- mercury-compiler-0.13.1.orig/configure	2007-01-07 16:27:24.000000000 +1300
++++ mercury-compiler-0.13.1/configure	2007-01-07 16:26:47.000000000 +1300
+@@ -7410,21 +7410,21 @@
+ 
+ echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
+ echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
+-if test "$mercury_cv_unboxed_floats" = yes; then
+-	if test "$BOOTSTRAP_MC" = ""; then
+-		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
+-****	cannot use unboxed floats, bootstrapping using boxed floats
+-****	after installation is complete you may want to reinstall
+-****	from scratch so you can use unboxed floats, which are more
+-****	efficient." >&5
+-echo "$as_me: WARNING: Mercury compiler not yet installed -
+-****	cannot use unboxed floats, bootstrapping using boxed floats
+-****	after installation is complete you may want to reinstall
+-****	from scratch so you can use unboxed floats, which are more
+-****	efficient." >&2;}
+-		mercury_cv_unboxed_floats=no
+-	fi
+-fi
++#if test "$mercury_cv_unboxed_floats" = yes; then
++#	if test "$BOOTSTRAP_MC" = ""; then
++#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
++#****	cannot use unboxed floats, bootstrapping using boxed floats
++#****	after installation is complete you may want to reinstall
++#****	from scratch so you can use unboxed floats, which are more
++#****	efficient." >&5
++#echo "$as_me: WARNING: Mercury compiler not yet installed -
++#****	cannot use unboxed floats, bootstrapping using boxed floats
++#****	after installation is complete you may want to reinstall
++#****	from scratch so you can use unboxed floats, which are more
++#****	efficient." >&2;}
++#		mercury_cv_unboxed_floats=no
++#	fi
++#fi
+ if test "$mercury_cv_unboxed_floats" = yes; then
+ 	HAVE_BOXED_FLOATS="--unboxed-float"
+ else
diff --git a/dev-lang/mercury/mercury-0.12.2-r4.ebuild b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
index ab876197f70d..6b9d0f8cfdb7 100644
--- a/dev-lang/mercury/mercury-0.12.2-r4.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.2 2007/01/07 02:48:35 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.3 2007/01/07 03:34:51 keri Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
+	epatch "${FILESDIR}"/${P}-unboxed_floats.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
index 12c262fa1d40..ecd4e4953f5d 100644
--- a/dev-lang/mercury/mercury-0.13.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.2 2007/01/07 03:09:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.3 2007/01/07 03:34:51 keri Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
+	epatch "${FILESDIR}"/${P}-unboxed_floats.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch