Patch to fix a mis-compilation in the rts due to strict aliasing, should be fixed...

Package-Manager: portage-2.1_rc4-r3

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 00500f65d6ec7a5145bc41b87d565e99801bd847..d91e341d99b4ece370494e02e2aadcc8610ba111 100644 (file)
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.104 2006/05/21 17:25:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.105 2006/06/15 12:18:36 dcoutts Exp $
+
+  15 Jun 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r3.ebuild,
+  ghc-6.4.2.ebuild:
+  Patch to fix a mis-compilation in the rts due to strict aliasing,
+  should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
 
   21 May 2006; Markus Rothe <corsair@gentoo.org> ghc-6.4.1-r2.ebuild:
   Stable on ppc64

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 97722c88679464e930de8ba6b263ad20e921d787..78d8269c068fd9bfa50cef87ca99fdf098ddcd4b 100644 (file)
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,17 +1,79 @@
-MD5 61506069877f46c472a047743b442973 ChangeLog 18582
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
-MD5 e15aa904a6de695d1d97c70b426d2133 files/digest-ghc-6.2.2 247
-MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r2 247
-MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r3 247
-MD5 e0d5838a93fd2efddbb7b3ad9bc2cf1b files/digest-ghc-6.4.2 753
+RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depsort.py 1958
+SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d files/depsort.py 1958
+AUX ghc-6.2.hardened.patch 525 RMD160 499210730c5b7578f1fe371b9304db65b00f59cc SHA1 e3bd39bbb3d99ee90231171a255847e5734818f3 SHA256 ed4c94ceb8e4749bd4d37a1542f5958175f0972b93a7137c5541698007b93d26
 MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
+RMD160 499210730c5b7578f1fe371b9304db65b00f59cc files/ghc-6.2.hardened.patch 525
+SHA256 ed4c94ceb8e4749bd4d37a1542f5958175f0972b93a7137c5541698007b93d26 files/ghc-6.2.hardened.patch 525
+AUX ghc-6.4.1-configure.patch 2666 RMD160 26568ec35d05a3855ad8cf10593d15ccaedee847 SHA1 fa85ae68645d95f30e8052018fe1e82b763b9c25 SHA256 7519b2fa9a9faf4c3545ed471803f85bc102b2428eb9c53ea15ae457271d28b9
 MD5 e522470e9d323932951f9efdb3fbf7e8 files/ghc-6.4.1-configure.patch 2666
+RMD160 26568ec35d05a3855ad8cf10593d15ccaedee847 files/ghc-6.4.1-configure.patch 2666
+SHA256 7519b2fa9a9faf4c3545ed471803f85bc102b2428eb9c53ea15ae457271d28b9 files/ghc-6.4.1-configure.patch 2666
+AUX ghc-6.4.1-gcc41.patch 1449 RMD160 dacc32425df3af36a77763f9a22c809c134ba157 SHA1 9c36db4ebff43d648a746898a4c16bbd60f45abc SHA256 243304ce6b553c46113b7cf84db2077933af214dc92a8959ec0bef06e6fb49c1
 MD5 60b4661916823941a6e1f17e8c6eaf11 files/ghc-6.4.1-gcc41.patch 1449
+RMD160 dacc32425df3af36a77763f9a22c809c134ba157 files/ghc-6.4.1-gcc41.patch 1449
+SHA256 243304ce6b553c46113b7cf84db2077933af214dc92a8959ec0bef06e6fb49c1 files/ghc-6.4.1-gcc41.patch 1449
+AUX ghc-6.4.1-openal.patch 1270 RMD160 fa7b57dc78cc36c9d74e55bc4873e6efc321f353 SHA1 e4e11d6ec44738caa8544867304f32461a2a6df5 SHA256 fe6db1cf73571bca4af195321112985201e695cf67ed889cf626e5dc2b54b67e
 MD5 f55d9cead45de0979d9650dccde5e168 files/ghc-6.4.1-openal.patch 1270
+RMD160 fa7b57dc78cc36c9d74e55bc4873e6efc321f353 files/ghc-6.4.1-openal.patch 1270
+SHA256 fe6db1cf73571bca4af195321112985201e695cf67ed889cf626e5dc2b54b67e files/ghc-6.4.1-openal.patch 1270
+AUX ghc-6.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096ea8e SHA1 40d25c25a3cd6a228f3757b8e298fd8c72710544 SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44
 MD5 bb39f157030944685ae41d24622a2cb3 files/ghc-6.4.2-sparc32plus.patch 526
+RMD160 970d062362284659c2570394c8f9328d8096ea8e files/ghc-6.4.2-sparc32plus.patch 526
+SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44 files/ghc-6.4.2-sparc32plus.patch 526
+AUX ghc-updater 9045 RMD160 b044a26add18464b583702f3cac667521c5eb06f SHA1 f5ccd2bf9f78f895368a1ff64ceddd5703f1d13b SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe
 MD5 e7ba0887c43fd8333a4d1bd92c184244 files/ghc-updater 9045
+RMD160 b044a26add18464b583702f3cac667521c5eb06f files/ghc-updater 9045
+SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe files/ghc-updater 9045
+DIST ghc-6.2.2-src.tar.bz2 5406427 RMD160 7afa370c148f2b9c3d53d662da996f5d7c05282d SHA1 9ca5bfed02210d3731a76fab5e25a8c690067fde SHA256 a0fe7eb8d447f25fbc616cdbce2bb4e03961a884c2c37969d1e23588b588a852
+DIST ghc-6.4.1-src.tar.bz2 6826112 RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 SHA1 96a3e76249c52b88e870c1e919ced3481c571b94 SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36
+DIST ghc-6.4.2-alut.patch.gz 6670 RMD160 e6ab2a114f44f6f176a98c9cd6ab1e336662a958 SHA1 879000d18b11d1edc1a32cf720ed24bbc20e8981 SHA256 e116b385df3bb5a5feb92ce92a92bdb0f24115361aedb1bddc9a7e6ce682d8b9
+DIST ghc-6.4.2-src.tar.bz2 6954958 RMD160 19943eb2673e663973e64739cdf23720b6f36d38 SHA1 60bcea323f851caa84d49c7731b86164d5cefa42 SHA256 d517e52e0204a077c54cda11b67bf9b6ac3daa47ac7bccf1561afc7c572e6be0
+DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
+EBUILD ghc-6.2.2.ebuild 5582 RMD160 b028ea26d634687c73fd8d688f6088d253230f33 SHA1 b296fb988351075bf517dfce85650291f94ab115 SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d
 MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
+RMD160 b028ea26d634687c73fd8d688f6088d253230f33 ghc-6.2.2.ebuild 5582
+SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d ghc-6.2.2.ebuild 5582
+EBUILD ghc-6.4.1-r2.ebuild 6680 RMD160 b1b362b08f49163affe9f48501865c77d6e56c66 SHA1 68498fd3dd98ea31e19f4deb0090a3c0f0002c32 SHA256 d97631f3912fb74515384a56999e4ad5ced795f6f4091eaad70e2b25238a9e17
 MD5 5d1e06c81fd595c0fc7f66a1b837a776 ghc-6.4.1-r2.ebuild 6680
-MD5 8445747f1eaf74aefb801c0542b9d5d0 ghc-6.4.1-r3.ebuild 9676
-MD5 9b2cabb6d2466c6b2d7fc2f96a1129ab ghc-6.4.2.ebuild 10383
+RMD160 b1b362b08f49163affe9f48501865c77d6e56c66 ghc-6.4.1-r2.ebuild 6680
+SHA256 d97631f3912fb74515384a56999e4ad5ced795f6f4091eaad70e2b25238a9e17 ghc-6.4.1-r2.ebuild 6680
+EBUILD ghc-6.4.1-r3.ebuild 9887 RMD160 eb1b866057c551798136c2ac8cf1d4ffe6649618 SHA1 e41d8befe099894d9eb40c9ad99e9c96e7a4897e SHA256 994b8d657bcffa6f0eaa5b0461059b4f92f69ae4a8fc81248a17e04affc2bce7
+MD5 48f6f75baaedcf00b8f4dcd66f167a33 ghc-6.4.1-r3.ebuild 9887
+RMD160 eb1b866057c551798136c2ac8cf1d4ffe6649618 ghc-6.4.1-r3.ebuild 9887
+SHA256 994b8d657bcffa6f0eaa5b0461059b4f92f69ae4a8fc81248a17e04affc2bce7 ghc-6.4.1-r3.ebuild 9887
+EBUILD ghc-6.4.2.ebuild 10594 RMD160 381c201311adc522f71120675709b62e0d23b8e4 SHA1 aad27fa2c5dd26c73110a3ac5d62afaa68d80a69 SHA256 6d111ee3935b91bffaa12a7ed39aef9153dda9561e72d4273d7cb4bf8913f91b
+MD5 a6fe00e3a9bf930a9c9a867134af7af8 ghc-6.4.2.ebuild 10594
+RMD160 381c201311adc522f71120675709b62e0d23b8e4 ghc-6.4.2.ebuild 10594
+SHA256 6d111ee3935b91bffaa12a7ed39aef9153dda9561e72d4273d7cb4bf8913f91b ghc-6.4.2.ebuild 10594
+MISC ChangeLog 18807 RMD160 4986eaf4a5b4e3c0166b73c9fded2d70a69a5e3d SHA1 676c043af871943f32c098e7746d0b6212963f86 SHA256 8ad79562b5f101215560602f49cd74fa7ef65d8e74b19cd6d5a1e25141e12ad0
+MD5 acabde09974243fea4684dec1d803bfc ChangeLog 18807
+RMD160 4986eaf4a5b4e3c0166b73c9fded2d70a69a5e3d ChangeLog 18807
+SHA256 8ad79562b5f101215560602f49cd74fa7ef65d8e74b19cd6d5a1e25141e12ad0 ChangeLog 18807
+MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
+RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
+SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
+MD5 e15aa904a6de695d1d97c70b426d2133 files/digest-ghc-6.2.2 247
+RMD160 08fa98200a54512a79a687475e4a65ccc0f4b28f files/digest-ghc-6.2.2 247
+SHA256 7fc3b897f80347476050b06f1749dfeaddb2c7d2c95dac7584c51588b29853b1 files/digest-ghc-6.2.2 247
+MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r2 247
+RMD160 3a660bda8203ea505f0ae443df45b679d80fe6f3 files/digest-ghc-6.4.1-r2 247
+SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/digest-ghc-6.4.1-r2 247
+MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r3 247
+RMD160 3a660bda8203ea505f0ae443df45b679d80fe6f3 files/digest-ghc-6.4.1-r3 247
+SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/digest-ghc-6.4.1-r3 247
+MD5 e0d5838a93fd2efddbb7b3ad9bc2cf1b files/digest-ghc-6.4.2 753
+RMD160 0d029ce257de088bf011643c75a1eb52796d3802 files/digest-ghc-6.4.2 753
+SHA256 84f4b6adad832de57cc219499590df79b6be7ac5c96ec975e15aa37370269d40 files/digest-ghc-6.4.2 753
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEkVAAnUVyUObPUL4RAraDAJ9bfT7J8agwekUNpITk8GVnRunZFwCghcyB
+/AEi7yYcWRSuGjt/Yqk6cCc=
+=/0v4
+-----END PGP SIGNATURE-----

diff --git a/dev-lang/ghc/ghc-6.4.1-r3.ebuild b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
index e50a2fce915ec2549efde96a439b9299dbe61b43..2d59eb03db3e9fb25ccc7d620b856a9174de2844 100644 (file)
--- a/dev-lang/ghc/ghc-6.4.1-r3.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.8 2006/05/19 16:06:10 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.9 2006/06/15 12:18:36 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -172,6 +172,10 @@ src_unpack() {
 
        # Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
        sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk"
+
+       # Patch to fix a mis-compilation in the rts due to strict aliasing,
+       # should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
+       echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
 }
 
 src_compile() {

diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index a4f24b7eda54560ca668cb7b5e98334a00935ea8..ab1b32ca8ca07baebef7a005c407096d63a02305 100644 (file)
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.6 2006/05/19 16:06:10 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.7 2006/06/15 12:18:36 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -174,6 +174,10 @@ src_unpack() {
        # if we turn down the optimisations in one problematic module.
        use ia64 && sed -i -e 's/OPTIONS_GHC/OPTIONS_GHC -O0 -optc-O/' \
                "${S}/libraries/base/GHC/Float.lhs"
+
+       # Patch to fix a mis-compilation in the rts due to strict aliasing,
+       # should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
+       echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
 }
 
 src_compile() {