A further fix for the executable stack issue.

Package-Manager: portage-2.1_pre5-r4

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index fef8989695e8892aaaaca55674e18c34fcbab4db..3d2ed3e153235439ba0870278a9e0d3655fa92e4 100644 (file)
--- 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.83 2006/03/13 17:16:20 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.84 2006/03/15 10:51:05 dcoutts Exp $
+
+  15 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r2.ebuild:
+  A further fix for the executable stack issue.
+  (It seems we need -Wa,--noexecstack in SRC_CC_OPTS as well as SRC_HC_OPTS)
 
   13 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> files/ghc-updater,
   ghc-6.4.1-r2.ebuild:

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 35d4d16c6c499eadf0b19f5f49a85fa4c0220842..04b7cde52916af6563f801455f9a65eb1d554be0 100644 (file)
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dec90029ac3ef52da17b63d2828b13a3 ChangeLog 14599
-RMD160 b24392445020b6a0e2b4d99fdece8dfc353cafaa ChangeLog 14599
-SHA256 d59145b2ab957936b08e94cf7a1bc4b2c76c0af119d66d9be682fd6b7ad6884f ChangeLog 14599
+MD5 04e85749d4868cc7b8a66e894a7a37a8 ChangeLog 14796
+RMD160 b1e2afdb1dfc0dd5253e3b2a223eec288e7708dc ChangeLog 14796
+SHA256 592dda8456a711cec8736edecf3b014539cf033da8de0c103688f8f5d6df482c ChangeLog 14796
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depsort.py 1958
 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d files/depsort.py 1958
@@ -34,9 +34,9 @@ SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe files/gh
 MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
 RMD160 b028ea26d634687c73fd8d688f6088d253230f33 ghc-6.2.2.ebuild 5582
 SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d ghc-6.2.2.ebuild 5582
-MD5 24b2e3fc858f218f2bc437e51a1e87af ghc-6.4.1-r2.ebuild 6535
-RMD160 7b8597e0623dd89e5472e864a0fdc5a82a31cb83 ghc-6.4.1-r2.ebuild 6535
-SHA256 e5c6fbdd2935eb5b6a24f0c6fb8dfddad0bfca205696719a2e4f418b439e0878 ghc-6.4.1-r2.ebuild 6535
+MD5 51e349b539c3c15b8f78d3599ed9b05f ghc-6.4.1-r2.ebuild 6589
+RMD160 2e0ac209927064d69e6b988523b5dda735fcf46a ghc-6.4.1-r2.ebuild 6589
+SHA256 55df19f95f3a30430e2d7b7271c1483ba1a4b5295a537355a7b8ec59d893ba87 ghc-6.4.1-r2.ebuild 6589
 MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
 RMD160 a6588f6fdd9d5420e13ba1ef545ae35cf647a523 ghc-6.4.ebuild 6109
 SHA256 8bd0631d7a331b61f8686d8c1db0ed7d30a689a723ff53d9a029e3f8ea406a25 ghc-6.4.ebuild 6109
@@ -46,7 +46,7 @@ SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEFajZ/B0cxt+cq+wRAp88AJ9aPsxm0Fn/CiLXJLBcpn2KuOY2AACdGfkk
-HCVNWd2A0hZBVCaYewcvcco=
-=djd8
+iD8DBQFEF/GO/B0cxt+cq+wRAmKTAKCl/RLvNWsT2EHtfYlUceBcUb5npwCgoNf5
+Dgy4Bc4Z0fkRy5Q5O/q+IuM=
+=HyGQ
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ghc/ghc-6.4.1-r2.ebuild b/dev-lang/ghc/ghc-6.4.1-r2.ebuild
index a22808a06a6a7016d0a08d2772613579bf0c967d..b2f185a292ed8a69b8225ddd25eacf59074724fa 100644 (file)
--- a/dev-lang/ghc/ghc-6.4.1-r2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1-r2.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-r2.ebuild,v 1.6 2006/03/13 17:16:20 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.7 2006/03/15 10:51:05 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -99,6 +99,7 @@ src_compile() {
 
        # We also need to use the GHC_CFLAGS flags when building ghc itself
        echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
+       echo "SRC_CC_OPTS+=-Wa,--noexecstack" >> mk/build.mk
 
        # determine what to do with documentation
        local mydoc