summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gabert <pappy@gentoo.org>2004-05-12 13:46:27 +0000
committerAlexander Gabert <pappy@gentoo.org>2004-05-12 13:46:27 +0000
commit8d3fcd472d1eefcf781b325094b272573506d9cf (patch)
tree228e534badff47802bbc2233adf3f5d7a708d26b /dev-lang/ghc
parentadded new switches for enabling and suppressing hardened PIE/SSP building (diff)
downloadgentoo-2-8d3fcd472d1eefcf781b325094b272573506d9cf.tar.gz
gentoo-2-8d3fcd472d1eefcf781b325094b272573506d9cf.tar.bz2
gentoo-2-8d3fcd472d1eefcf781b325094b272573506d9cf.zip
added new hardened PIE SSP switches
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/ChangeLog5
-rw-r--r--dev-lang/ghc/Manifest4
-rw-r--r--dev-lang/ghc/ghc-6.2.1.ebuild9
3 files changed, 9 insertions, 9 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index d1b7327b5e1f..fec135403680 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.33 2004/05/12 11:07:44 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.34 2004/05/12 13:42:18 pappy Exp $
+
+ 12 May 2004; Alexander Gabert <pappy@gentoo.org> ghc-6.2.1.ebuild:
+ added new hardened PIE SSP switches
12 May 2004; Alexander Gabert <pappy@gentoo.org>
-files/ghc-6.2.hardened-gcc.patch.bz2, +files/ghc-6.2.hardened.patch.bz2,
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 6578178d70cf..f898c37dd8bf 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,8 +1,8 @@
-MD5 f7474a68de38156f7519d27278f00943 ChangeLog 7249
+MD5 7d743c8854db26cc09e2da8577bf1544 ChangeLog 7357
MD5 c6174c846ff8e4a661d37f2e83439259 ghc-6.0.1.ebuild 4748
MD5 19d1d6422bd1d71de0eecc9038fba1db ghc-6.0.ebuild 4279
MD5 50f9830da95e914dfc0f6df78c2dcfc0 ghc-6.2-r1.ebuild 5222
-MD5 c64ba761417065cce6f62a6be39619d2 ghc-6.2.1.ebuild 5274
+MD5 694725f17426e0ff25f79ec8ced3086a ghc-6.2.1.ebuild 5231
MD5 aabf26ff74487ed423225142b7e20d25 ghc-6.2.ebuild 5040
MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65
diff --git a/dev-lang/ghc/ghc-6.2.1.ebuild b/dev-lang/ghc/ghc-6.2.1.ebuild
index a99b310d461e..17ebdf4d4bf3 100644
--- a/dev-lang/ghc/ghc-6.2.1.ebuild
+++ b/dev-lang/ghc/ghc-6.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.1.ebuild,v 1.2 2004/04/01 22:26:18 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.1.ebuild,v 1.3 2004/05/12 13:42:18 pappy Exp $
#Some explanation of bootstrap logic:
#
@@ -88,11 +88,8 @@ src_compile() {
# (this is still necessary, even though we have the patch, because
# we might be bootstrapping from a version that didn't have the
# patch included)
- if has_version "sys-devel/hardened-gcc"
- then
- echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
- echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
- fi
+ echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
+ echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
# force the config variable ArSupportsInput to be unset;
# ar in binutils >= 2.14.90.0.8-r1 seems to be classified