summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2006-03-15 10:51:05 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2006-03-15 10:51:05 +0000
commit6c83bb56571bf15a0694e9bedbe5370d557a8efe (patch)
tree207f421fe0261a83ba5454af495db4f929ffe2d0 /dev-lang/ghc
parentadded debug use-flag (diff)
downloadgentoo-2-6c83bb56571bf15a0694e9bedbe5370d557a8efe.tar.gz
gentoo-2-6c83bb56571bf15a0694e9bedbe5370d557a8efe.tar.bz2
gentoo-2-6c83bb56571bf15a0694e9bedbe5370d557a8efe.zip
A further fix for the executable stack issue.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/ChangeLog6
-rw-r--r--dev-lang/ghc/Manifest16
-rw-r--r--dev-lang/ghc/ghc-6.4.1-r2.ebuild3
3 files changed, 10 insertions, 15 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index fef8989695e8..3d2ed3e15323 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.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 35d4d16c6c49..3d635a046552 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 dec90029ac3ef52da17b63d2828b13a3 ChangeLog 14599
RMD160 b24392445020b6a0e2b4d99fdece8dfc353cafaa ChangeLog 14599
SHA256 d59145b2ab957936b08e94cf7a1bc4b2c76c0af119d66d9be682fd6b7ad6884f ChangeLog 14599
@@ -34,19 +31,12 @@ 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 53615fbcfed6b357cffe735395ecbf55 ghc-6.4.1-r2.ebuild 6589
+RMD160 85851a86146f1d9c31898766f9950bcd19d66360 ghc-6.4.1-r2.ebuild 6589
+SHA256 985eadc1f3f9e8516336e7df2b00c309365999727c3290dfafc2cf20b20e8081 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
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)
-
-iD8DBQFEFajZ/B0cxt+cq+wRAp88AJ9aPsxm0Fn/CiLXJLBcpn2KuOY2AACdGfkk
-HCVNWd2A0hZBVCaYewcvcco=
-=djd8
------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 a22808a06a6a..b2f185a292ed 100644
--- 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