Merge unboxed_float fix into bootstrap patch

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 263fd5fca4e3ae320243a60c53bd40d05c451598..8ebe6a10eab10c0e0e4b7805a9ea9db79756d885 100644 (file)
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
 # 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.71 2007/01/08 06:27:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.72 2007/01/08 07:50:42 keri Exp $
+
+  08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch:
+  Merge unboxed_float fix into bootstrap patch.
 
   08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
   -files/mercury-0.12.2-unboxed_floats.patch,

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 9a25b85008ffcacef82dad94c7c7a52cd4ab16d6..49bbf1e2bf116e58cbe2f00b900b4f698460e288 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -10,10 +10,10 @@ AUX mercury-0.12.2-MAKEOPTS.patch 602 RMD160 866e63a6e48b4844f8dbe19d167030f6e22
 MD5 4930c851f3d1719419e107f92aa99873 files/mercury-0.12.2-MAKEOPTS.patch 602
 RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 files/mercury-0.12.2-MAKEOPTS.patch 602
 SHA256 42850d29291fd6d77074706e21eaebce1de74a050c73f7e7eb1785e1c46e7398 files/mercury-0.12.2-MAKEOPTS.patch 602
-AUX mercury-0.12.2-bootstrap.patch 3444 RMD160 643c5592bb2ad083f639543ee283c008f787d613 SHA1 38f3c7484e289454ad3782c43ac8f95c94b65c46 SHA256 ba9fe33b46e58892ce51c440763905a14c8d021f73f9e3247e8004303cace376
-MD5 c8f96bcee751100df3b7f1591e37cd7c files/mercury-0.12.2-bootstrap.patch 3444
-RMD160 643c5592bb2ad083f639543ee283c008f787d613 files/mercury-0.12.2-bootstrap.patch 3444
-SHA256 ba9fe33b46e58892ce51c440763905a14c8d021f73f9e3247e8004303cace376 files/mercury-0.12.2-bootstrap.patch 3444
+AUX mercury-0.12.2-bootstrap.patch 5082 RMD160 6f5f9040fa7b61236abc158111c5f9834311d074 SHA1 49588af118605f4c661ead2db67151b7b7afa699 SHA256 a1895f82e4b129c01ad2d0cfb1ac044d833c9f7c22021757670eaf2d6823c1b5
+MD5 af445ae3cd1ff9001006bc86858f09d2 files/mercury-0.12.2-bootstrap.patch 5082
+RMD160 6f5f9040fa7b61236abc158111c5f9834311d074 files/mercury-0.12.2-bootstrap.patch 5082
+SHA256 a1895f82e4b129c01ad2d0cfb1ac044d833c9f7c22021757670eaf2d6823c1b5 files/mercury-0.12.2-bootstrap.patch 5082
 AUX mercury-0.12.2-deep_profiler.patch 2807 RMD160 533f90a2b4366279d030be3b9983cec05f8c743c SHA1 c09682feeb9d9c426d69635bc71140552f54fed8 SHA256 479546aaaf966c4665e444af187f099b51fb3c78479753297d78336701ef301f
 MD5 d60a4fa180d8a28cc2ab280c0cb33614 files/mercury-0.12.2-deep_profiler.patch 2807
 RMD160 533f90a2b4366279d030be3b9983cec05f8c743c files/mercury-0.12.2-deep_profiler.patch 2807
@@ -204,10 +204,10 @@ EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6a
 MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 14002 RMD160 67a432c5d53cddd2122ce0f446480ff9a44115d3 SHA1 5c3ad71f338fc676003a9f99ab87f8618a31dc38 SHA256 db400f179d1234e9d6312bfe55e0cbbecc71dd392a52a173c0082a4c17b42468
-MD5 8e6a970265b889124d76b4de187bccc7 ChangeLog 14002
-RMD160 67a432c5d53cddd2122ce0f446480ff9a44115d3 ChangeLog 14002
-SHA256 db400f179d1234e9d6312bfe55e0cbbecc71dd392a52a173c0082a4c17b42468 ChangeLog 14002
+MISC ChangeLog 14127 RMD160 4655f577bab9399881e40c258223fa44bf94f362 SHA1 2278ced42fe2f5574a74b0cc20d0292ba3ca2afe SHA256 c7a185eef9e9db541d9f04062720ddc8140c8b52c2abac2f87fe1195fb6cb81c
+MD5 82f147162c47fdfc5ba9f95aad19e7d8 ChangeLog 14127
+RMD160 4655f577bab9399881e40c258223fa44bf94f362 ChangeLog 14127
+SHA256 c7a185eef9e9db541d9f04062720ddc8140c8b52c2abac2f87fe1195fb6cb81c ChangeLog 14127
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247

diff --git a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch
index 68e6dbc0ac94f8c2a510201d719c32c077184c65..32a2e6fbd921b6f90ac23d7dd134eecf71d5f7c9 100644 (file)
--- a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch
@@ -1,5 +1,42 @@
 --- mercury-compiler-0.12.2.orig/configure     2006-01-25 17:24:01.000000000 +1300
 +++ mercury-compiler-0.12.2/configure  2006-07-24 20:11:45.000000000 +1200
+@@ -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
 @@ -8790,34 +8790,34 @@
  
  if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then