Unboxed float fix on stage1 bootstrap.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 2673a1195c41dd683e68991a942be39522f1d377..1bf807db5db96d36b8860ec995f1db2e9386353e 100644 (file)
--- 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/Manifest b/dev-lang/mercury/Manifest
index 96d4a5b840cea1673f3aede7d62987d50571288d..162c34cc30d5332a6892b40665e79f1c328ed159 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -70,6 +70,10 @@ AUX mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322
 MD5 cdfafee8cc55f364644e65a4fc841b1c files/mercury-0.12.2-tests.patch 7502
 RMD160 88e9a509c696bb32d7982708261685a602322070 files/mercury-0.12.2-tests.patch 7502
 SHA256 8895bb246d111c3c09b309f3332a42f6bc3b6ea1f96f56537c2ccd2f82ac362f files/mercury-0.12.2-tests.patch 7502
+AUX mercury-0.12.2-unboxed_floats.patch 1791 RMD160 8cf53995aa73213ede8ca19b823f689d34ccf8e1 SHA1 27cedde6180ba1b8150737e6178173b6a1712843 SHA256 7d9c4da5744c2bad2bd8689a8a70b88652708e028d3b6f9ed7dc499125d2a414
+MD5 6ec6bd1348330a25ee1c6c0183e0d35e files/mercury-0.12.2-unboxed_floats.patch 1791
+RMD160 8cf53995aa73213ede8ca19b823f689d34ccf8e1 files/mercury-0.12.2-unboxed_floats.patch 1791
+SHA256 7d9c4da5744c2bad2bd8689a8a70b88652708e028d3b6f9ed7dc499125d2a414 files/mercury-0.12.2-unboxed_floats.patch 1791
 AUX mercury-0.13.0-CFLAGS.patch 1323 RMD160 7de97579d81eaad521232981d32f0e9f2113a03f SHA1 0bb34affd44043dd6df58aadaa17e85204468fbc SHA256 7be5d4a8563fc17ea06fc064814d5963a61b2ff9978565270a1f67f06185e383
 MD5 cdcf65c651f63996b24a247f1566a684 files/mercury-0.13.0-CFLAGS.patch 1323
 RMD160 7de97579d81eaad521232981d32f0e9f2113a03f files/mercury-0.13.0-CFLAGS.patch 1323
@@ -178,6 +182,10 @@ AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed
 MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074
 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074
 SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647 files/mercury-0.13.1-tests.patch 15074
+AUX mercury-0.13.1-unboxed_floats.patch 1791 RMD160 d6a3629b5bbd13d41b9c364fe428ca21c9f7eeec SHA1 5a9a3fc0048d5aa68f842c0055c20e66b03c4353 SHA256 5c05c685da1f077a012d37eacda4160e0b877fa13235732efa014137172b6b37
+MD5 9c5abdaf7b52ea92e63d4e84dbda7df1 files/mercury-0.13.1-unboxed_floats.patch 1791
+RMD160 d6a3629b5bbd13d41b9c364fe428ca21c9f7eeec files/mercury-0.13.1-unboxed_floats.patch 1791
+SHA256 5c05c685da1f077a012d37eacda4160e0b877fa13235732efa014137172b6b37 files/mercury-0.13.1-unboxed_floats.patch 1791
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
 DIST mercury-compiler-0.13.0.tar.gz 15861463 RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b SHA1 7a9362225e1b51d7d1b342c39203ad0ef1b9f952 SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
@@ -188,26 +196,26 @@ EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec7
 MD5 181fbbca5d6184eafcf27c498245e199 mercury-0.12.2-r3.ebuild 3450
 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 mercury-0.12.2-r3.ebuild 3450
 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac mercury-0.12.2-r3.ebuild 3450
-EBUILD mercury-0.12.2-r4.ebuild 3782 RMD160 de9c6c324bf93f4e55a8e8e28ef95faf2171afd5 SHA1 7e1f7b8851d8eb51ba04b6405a130c599d37b416 SHA256 a2748c24dc81467a406281a6457b1699b9049f5bf598559f421a89b7b940e3fb
-MD5 b2434fdf596c3f9de26d2a97ac2078d3 mercury-0.12.2-r4.ebuild 3782
-RMD160 de9c6c324bf93f4e55a8e8e28ef95faf2171afd5 mercury-0.12.2-r4.ebuild 3782
-SHA256 a2748c24dc81467a406281a6457b1699b9049f5bf598559f421a89b7b940e3fb mercury-0.12.2-r4.ebuild 3782
+EBUILD mercury-0.12.2-r4.ebuild 3830 RMD160 8e286b7d1bc584ee38f3dfd6ce2c414cf5a8e0d2 SHA1 cb648e149d61f43adfdd7660aab5fe0d1c183e4f SHA256 f8b46cbc298270c582c7a77ca2d00f6acf37f57f04d59a127378d64eecc10d23
+MD5 a4e8ef2d1c41edb8e5ebe5ea5f965b8a mercury-0.12.2-r4.ebuild 3830
+RMD160 8e286b7d1bc584ee38f3dfd6ce2c414cf5a8e0d2 mercury-0.12.2-r4.ebuild 3830
+SHA256 f8b46cbc298270c582c7a77ca2d00f6acf37f57f04d59a127378d64eecc10d23 mercury-0.12.2-r4.ebuild 3830
 EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399
-EBUILD mercury-0.13.1-r1.ebuild 3617 RMD160 b3a15d4be96f309023dc87147b1c41f3a9e318c3 SHA1 1aa9ed345025fa07e8a66631f615a4621cbd0608 SHA256 4308e74d7e3562c6791d546dad3d28b4b6e7ac22340f3f7a4ad6df7bfec14619
-MD5 5a420de2f30dbacc5eac2497c3521937 mercury-0.13.1-r1.ebuild 3617
-RMD160 b3a15d4be96f309023dc87147b1c41f3a9e318c3 mercury-0.13.1-r1.ebuild 3617
-SHA256 4308e74d7e3562c6791d546dad3d28b4b6e7ac22340f3f7a4ad6df7bfec14619 mercury-0.13.1-r1.ebuild 3617
+EBUILD mercury-0.13.1-r1.ebuild 3665 RMD160 e00c5b28dbdeba00cff9ae81042d2433838f049a SHA1 966ec264021f9726af980606b7f8ec8c3afeb051 SHA256 5646e6ff5175b855047420c95505369214af92070aebc72ca99c4cab0d43aa54
+MD5 1d4bf3faa0bde3f63db65ea69248b977 mercury-0.13.1-r1.ebuild 3665
+RMD160 e00c5b28dbdeba00cff9ae81042d2433838f049a mercury-0.13.1-r1.ebuild 3665
+SHA256 5646e6ff5175b855047420c95505369214af92070aebc72ca99c4cab0d43aa54 mercury-0.13.1-r1.ebuild 3665
 EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab SHA1 d8a9456db6ba4bfa5ece3334ffcda96c2dc4e5c5 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f
 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 13432 RMD160 857966b5c7282bd5a5635e606d302336155016f4 SHA1 2f6f1d32ddfff6fc18d92f028d6fa7e7a091e9f9 SHA256 ee9830cd8ca92dbafad56ccac7b88ceb217ac455c848fbcdde65e3bf283b5c9c
-MD5 41afc1e7c7a9b2b0c2f0fc19f5d7c619 ChangeLog 13432
-RMD160 857966b5c7282bd5a5635e606d302336155016f4 ChangeLog 13432
-SHA256 ee9830cd8ca92dbafad56ccac7b88ceb217ac455c848fbcdde65e3bf283b5c9c ChangeLog 13432
+MISC ChangeLog 13658 RMD160 5f3ef5e36b176999239aabee0b2d9b452cc03afe SHA1 17c8c575a68f8605692ff7db7998734052221ca7 SHA256 bec1af81493bfc16a292d1d5a13160a834702144aa32ddde4988b7adf47fcb47
+MD5 8d732b63d008eebf7932ce50d71a7990 ChangeLog 13658
+RMD160 5f3ef5e36b176999239aabee0b2d9b452cc03afe ChangeLog 13658
+SHA256 bec1af81493bfc16a292d1d5a13160a834702144aa32ddde4988b7adf47fcb47 ChangeLog 13658
 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-unboxed_floats.patch b/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch
new file mode 100644 (file)
index 0000000..b8e91b7
--- /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 (file)
index 0000000..13a68c2
--- /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 ab876197f70db358bf2a2149897ae86c1987926e..6b9d0f8cfdb738c57db0b8f12a3f757b92073838 100644 (file)
--- 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 12c262fa1d40a7b0c4a441e652c218dd54bfccbc..ecd4e4953f5dec1ca00e1d9c04cb3379dcd34387 100644 (file)
--- 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