summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Loeh <kosmikus@gentoo.org>2004-05-13 15:03:56 +0000
committerAndres Loeh <kosmikus@gentoo.org>2004-05-13 15:03:56 +0000
commitb79c9b9c84b7e06c00d36860f390b419565f5da5 (patch)
tree844ac15c7c78dc6d147a8855d8f062e92160e0dd
parentAdded s390 keywords (Manifest recommit) (diff)
downloadgentoo-2-b79c9b9c84b7e06c00d36860f390b419565f5da5.tar.gz
gentoo-2-b79c9b9c84b7e06c00d36860f390b419565f5da5.tar.bz2
gentoo-2-b79c9b9c84b7e06c00d36860f390b419565f5da5.zip
fixed patch filename and bug #50758 (superfluous option)
-rw-r--r--dev-lang/ghc/ChangeLog5
-rw-r--r--dev-lang/ghc/ghc-6.2.1.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index fec135403680..003170408972 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.34 2004/05/12 13:42:18 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.35 2004/05/13 15:03:56 kosmikus Exp $
+
+ 13 May 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.1.ebuild:
+ fixed patch for ghc-6.2.1; threaded rts now enabled by default (#50758)
12 May 2004; Alexander Gabert <pappy@gentoo.org> ghc-6.2.1.ebuild:
added new hardened PIE SSP switches
diff --git a/dev-lang/ghc/ghc-6.2.1.ebuild b/dev-lang/ghc/ghc-6.2.1.ebuild
index 17ebdf4d4bf3..c362c75076fb 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.3 2004/05/12 13:42:18 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.1.ebuild,v 1.4 2004/05/13 15:03:56 kosmikus Exp $
#Some explanation of bootstrap logic:
#
@@ -74,7 +74,7 @@ src_unpack() {
# mangler doesn't accept its output; yes, the 6.2 version
# should do ...
cd ${S}
- bzcat ${FILESDIR}/ghc-6.2.hardened-gcc.patch.bz2 | patch -p1
+ bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p1
}
src_compile() {
@@ -104,8 +104,9 @@ src_compile() {
# unset SGML_CATALOG_FILES because documentation installation
# breaks otherwise ...
+ # (--enable-threaded-rts is no longer needed)
PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
- --enable-threaded-rts ${myconf} || die "econf failed"
+ ${myconf} || die "econf failed"
# the build does not seem to work all that
# well with parallel make