Change the use of CFLAGS again. Filter out -O2 on arches where it breaks.

Package-Manager: portage-2.1_pre5-r4

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 7c599c69198a9bdd469a269e1853b049a89b3870..519ba1326c93b1d2886f5400a4a954dce1a09982 100644 (file)
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.91 2006/03/27 12:38:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.92 2006/03/28 17:25:20 dcoutts Exp $
+
+  28 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r3.ebuild:
+  Change the use of CFLAGS again. Filter out -O2 on arches where it breaks.
 
   27 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> -ghc-6.4.ebuild:
   Remove 6.4 since 6.4.1 is stable and 6.4 was rather buggy anyway.

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index ba7b3eaebd9ca55c24599e2779cd3332e39b7309..a7c33fde177c4c095aa0bb16a0716c84e56beacd 100644 (file)
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ea5a5716c67be90027002146b50dcebe ChangeLog 15837
-RMD160 f05aa0de0e1a6c935eff68b261c204bcd8d532cd ChangeLog 15837
-SHA256 59727977db06f680dbed9f032b1870d8dba94b83e709893b18c85c3187e20bb7 ChangeLog 15837
+MD5 3521e5306e57e51f27bc44a492cee2a6 ChangeLog 15985
+RMD160 8a3ddd8376f8c621a389174e84e0e4dee2d5d94e ChangeLog 15985
+SHA256 a028e7ef65c6473ecd61a453f19233fa543644de1ed83e80e1c5163725810894 ChangeLog 15985
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depsort.py 1958
 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d files/depsort.py 1958
@@ -40,16 +40,16 @@ SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d ghc-6.2.
 MD5 023083edca77ca477112f30ab38fda1d ghc-6.4.1-r2.ebuild 6576
 RMD160 6bd768a6d64e1fc96caa9110f9108f73a5d69cef ghc-6.4.1-r2.ebuild 6576
 SHA256 0bae3a55cd34d59202ea1411ff6f3f8829c9a61acbf4351abfcd48633551226c ghc-6.4.1-r2.ebuild 6576
-MD5 1696046c8f6e6b36c3ed107b3a87ded1 ghc-6.4.1-r3.ebuild 8669
-RMD160 747e2c6a73fbee7708ba8befbf5757c88291480b ghc-6.4.1-r3.ebuild 8669
-SHA256 74ed9295c19cf20e1051740528325bb4c553a8a5c8507ee6ae8beb0873d5b9dd ghc-6.4.1-r3.ebuild 8669
+MD5 3955e5965137279aaca897945bdcfe64 ghc-6.4.1-r3.ebuild 8772
+RMD160 41389b2264045fe0d1a1b6ff6ba34b675c56f88c ghc-6.4.1-r3.ebuild 8772
+SHA256 169ce8be3dc2553d510adff2aa785347368c1970a53dfc94f96b1e5834d37032 ghc-6.4.1-r3.ebuild 8772
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEJ9zT/B0cxt+cq+wRAtxeAJsGdtYu3cqcIamt/iYfEf4A1zN2UACfVV4/
-SfxB1zwR2XVqFgkFNGdpVZE=
-=/5Nd
+iD8DBQFEKXF2/B0cxt+cq+wRAoiSAKCD7Rj+Uw4xRebujJBEzGGhRhi4KwCdH0yz
+TDXyUv1E4daODWwOo8s63RQ=
+=3ik2
 -----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 5026b381b0e8df8e5cf826f5d73790fc4db665d0..2ac489525a202d0d11832a612c492309c442cf64 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.1 2006/03/26 23:03:00 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.2 2006/03/28 17:25:20 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -97,17 +97,24 @@ ghc_setup_cflags() {
        strip-unsupported-flags
        filter-flags -fPIC
 
-       # On ia64 ghc doesn't cope well with the assembler output of gcc if we use
-       # too high a level of optimisation. -O2 is too much while -O is ok.
-       use ia64 && replace-flags -O? -O
-
        GHC_CFLAGS=""
        for flag in ${CFLAGS}; do
                case ${flag} in
-                       -O*) append-ghc-cflags compile ${flag};;
+
+                       # These would just dup what ghc does anyway
+                       -O|-O1) ;;
+
+                       # We have to be really careful with more agressive -O flags
+                       # as they do break ghc on some arches.
+                       -O2|-O3|-Os) use ia64 || use sparc || append-ghc-cflags compile ${flag};;
+
+                       # Arch and ABI flags are probably ok
                        -m*) append-ghc-cflags compile assemble ${flag};;
+
+                       # Debugging flags are also probably ok
                        -g*) append-ghc-cflags compile assemble ${flag};;
-                          # ignore all other flags, including all -f* flags
+
+                       # Ignore all other flags, including all -f* flags
                esac
        done