From cc53ea73d59d1966ac3eb2adcb6f8aa3fe355bd1 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 13 May 2004 15:03:56 +0000 Subject: fixed patch filename and bug #50758 (superfluous option) --- dev-lang/ghc/ChangeLog | 5 ++++- dev-lang/ghc/Manifest | 22 +++++++++++----------- dev-lang/ghc/ghc-6.2.1.ebuild | 7 ++++--- 3 files changed, 19 insertions(+), 15 deletions(-) (limited to 'dev-lang/ghc') 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 ghc-6.2.1.ebuild: + fixed patch for ghc-6.2.1; threaded rts now enabled by default (#50758) 12 May 2004; Alexander Gabert ghc-6.2.1.ebuild: added new hardened PIE SSP switches diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 8fd53702b004..aa87edcb43d5 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -1,17 +1,17 @@ -MD5 831aa74f78df6c926ff4e7dc60a6867d ChangeLog 7357 -MD5 c6174c846ff8e4a661d37f2e83439259 ghc-6.0.1.ebuild 4748 +MD5 6083bff4693a97ecea3803981953c9d7 ghc-6.2.1.ebuild 5254 MD5 19d1d6422bd1d71de0eecc9038fba1db ghc-6.0.ebuild 4279 -MD5 50f9830da95e914dfc0f6df78c2dcfc0 ghc-6.2-r1.ebuild 5222 -MD5 d10f83829b2ed82acce9681d4238db2d ghc-6.2.1.ebuild 5230 MD5 aabf26ff74487ed423225142b7e20d25 ghc-6.2.ebuild 5040 +MD5 c6174c846ff8e4a661d37f2e83439259 ghc-6.0.1.ebuild 4748 +MD5 001fbde5ca37cf7249f391c375bfd16c ChangeLog 7502 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 -MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65 +MD5 50f9830da95e914dfc0f6df78c2dcfc0 ghc-6.2-r1.ebuild 5222 +MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050 +MD5 9c184505ec441675c94d47a3110fa754 files/ghc-6.2.documentation.patch 721 +MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717 MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67 -MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2 65 -MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2-r1 65 MD5 0cc23d312b60d64e20735768503db1c6 files/digest-ghc-6.2.1 67 -MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717 -MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380 -MD5 9c184505ec441675c94d47a3110fa754 files/ghc-6.2.documentation.patch 721 -MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050 +MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2-r1 65 +MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65 +MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2 65 MD5 c2e63b1796b9c089a23a07b0eb6e76a7 files/ghc-6.2.hardened.patch.bz2 362 +MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380 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 -- cgit v1.2.3-65-gdbad