-O* flags (from the users CFLAGS) breaks ghc on too many systems so don't add it to ghc's CFLAGS. Also remove ia64 GOT patch that didn't help.

Package-Manager: portage-2.1_pre7-r3

3 files changed, 18 insertions, 23 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index eac4457672e4..caa5ad825a29 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.93 2006/03/28 17:28:48 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.94 2006/04/06 17:15:03 dcoutts Exp $
+
+  06 Apr 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r3.ebuild:
+  -O* flags (from the users CFLAGS) breaks ghc on too many systems so don't
+  add it to ghc's CFLAGS. Also remove ia64 GOT patch that didn't help.
 
   28 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r2.ebuild:
   Enable SplitObjs on ppc. This gives much smaller binaries.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 779a889f2d3c..192bb9d4a69a 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c177652b578e115b9a79ceb5cc100ca3 ChangeLog 16118
-RMD160 b83c48ef709d9f192f593939d1b599d247cdc475 ChangeLog 16118
-SHA256 115a69b8e5b20023f0f14c8e1cb57adedd7218c5f46f7a39e9c2bfbfc9d449be ChangeLog 16118
+MD5 1be902b6c1b825f6e03ec503bd962f16 ChangeLog 16337
+RMD160 fb429e5b4d9c8c45f8b85f2aaefb5d6d4b03ce78 ChangeLog 16337
+SHA256 0fe7f091276a29a88da810176373e14eb32a6ee28d24ec9befa2dc9ca038cc45 ChangeLog 16337
 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 4a793290021c3e25bb6d1fa6894ab623 ghc-6.4.1-r2.ebuild 6562
 RMD160 c66261e4d838cdd154d20768a405a91db9d23bd3 ghc-6.4.1-r2.ebuild 6562
 SHA256 230bfc6d51c9e7c9d8e6f231474691250a69619b85a72d4ef1f9069c212d6ffb ghc-6.4.1-r2.ebuild 6562
-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 41c0f71276fa87bbea285600ddfa19b4 ghc-6.4.1-r3.ebuild 8311
+RMD160 0db7953a713330182ec283b96b996a7ded206aec ghc-6.4.1-r3.ebuild 8311
+SHA256 63c477f7ef008ca810588624ab04bd1146e270e158163bda650f9a8f6541400e ghc-6.4.1-r3.ebuild 8311
 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)
 
-iD8DBQFEKXJG/B0cxt+cq+wRAqbQAJ49f1bNibMphpH0/a27KPEosb0mygCfZcY6
-XSzq6YWalerOdID/uLnAI+c=
-=Yv+v
+iD8DBQFENUyG/B0cxt+cq+wRAhyWAJ99ptAPxh3cA+9z1ZHTHoKNDrUbTQCbBplH
++LLt93Ohb7vUAa8e3/eADV0=
+=byE0
 -----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 2ac489525a20..45bc6215b8b4 100644
--- 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.2 2006/03/28 17:25:20 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.3 2006/04/06 17:15:03 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -101,12 +101,9 @@ ghc_setup_cflags() {
 	for flag in ${CFLAGS}; do
 		case ${flag} in
 
-			# 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};;
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
 
 			# Arch and ABI flags are probably ok
 			-m*) append-ghc-cflags compile assemble ${flag};;
@@ -144,12 +141,6 @@ src_unpack() {
 
 	# Patch to fix parallel make
 	sed -i 's/mkDerivedConstants.c : $(H_CONFIG)/mkDerivedConstants.c :	$(H_CONFIG) $(H_PLATFORM)/' "${S}/ghc/includes/Makefile"
-
-	# We need bigger tables on ia64 to be able to load larger packages
-	sed -i  -e 's/#define GOT_SIZE            0x20000/#define GOT_SIZE 0x40000/' \
-			-e 's/#define FUNCTION_TABLE_SIZE 0x10000/#define FUNCTION_TABLE_SIZE 0x20000/' \
-			-e 's/#define PLT_SIZE            0x08000/#define PLT_SIZE 0x16000/' \
-		"${S}/ghc/rts/Linker.c"
 }
 
 src_compile() {