diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/Manifest | 22 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-5.04.3-r1.ebuild | 32 |
3 files changed, 32 insertions, 28 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 524d7af36fd1..2e89f294aaae 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.15 2003/06/01 09:17:50 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.16 2003/07/02 11:01:11 kosmikus Exp $ + + 02 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild: + Removed implicit X11 dependency (bug 23708). Thanks to Aaron Son + <aaron@clamp.net> for discovering the problem. *ghc-6.0 (01 Jun 2003) diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index b2cbf0abec7b..96b9e7cd5ea7 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -1,18 +1,18 @@ -MD5 27838f3d871940e0ef5af07ce1e756b1 ChangeLog 4372 -MD5 42b857369c2e24507f00520e99fdaf5a ghc-5.02.3.ebuild 7646 -MD5 4e310a2cb7f0093cd85d9a366f2337cc ghc-5.04.2.ebuild 4536 MD5 53cadcab720c08f0d03fced644adc7ce ghc-5.04.3.ebuild 4536 +MD5 240b389b82fc54b2ebf37c22f4f3c9f3 ghc-5.04.3-r1.ebuild 6071 MD5 d1ee334700eb465393538865978531b5 ghc-5.04.ebuild 6950 -MD5 5017802bf913628f63a0e8e142d967ef ghc-5.04.3-r1.ebuild 6062 MD5 72a8b0dc85cf271c331d3508a3884c6d ghc-6.0.ebuild 4241 -MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65 -MD5 2891bd736d41f4aeea530385ef426d6d files/digest-ghc-5.02.3 207 -MD5 199f2676b7f849997c3e45c0c604c4a5 files/digest-ghc-5.04 205 -MD5 7bf7dff845836a99f4b08d8b230d916f files/digest-ghc-5.04.2 68 -MD5 a20f2d9eabadd7ed4890784b905f857c files/digest-ghc-5.04.3 68 -MD5 b5a1b76b1e1f437dcf7b9aa4b1545f40 files/ghc-4.08.2-gentoo.patch.bz2 640 +MD5 4e310a2cb7f0093cd85d9a366f2337cc ghc-5.04.2.ebuild 4536 +MD5 42b857369c2e24507f00520e99fdaf5a ghc-5.02.3.ebuild 7646 +MD5 40bde6c6e846748c6aeee2bd58df42b2 ChangeLog 4560 +MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050 MD5 cc8947705ec2b2a685edb4eefddeebc2 files/ghc-5.02.3-gentoo.patch.bz2 14489 MD5 1c126024044290a2f7e501c0f4415169 files/ghc-5.04-gentoo.patch.bz2 68891 -MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050 MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717 +MD5 b5a1b76b1e1f437dcf7b9aa4b1545f40 files/ghc-4.08.2-gentoo.patch.bz2 640 MD5 a20f2d9eabadd7ed4890784b905f857c files/digest-ghc-5.04.3-r1 68 +MD5 2891bd736d41f4aeea530385ef426d6d files/digest-ghc-5.02.3 207 +MD5 7bf7dff845836a99f4b08d8b230d916f files/digest-ghc-5.04.2 68 +MD5 a20f2d9eabadd7ed4890784b905f857c files/digest-ghc-5.04.3 68 +MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65 +MD5 199f2676b7f849997c3e45c0c604c4a5 files/digest-ghc-5.04 205 diff --git a/dev-lang/ghc/ghc-5.04.3-r1.ebuild b/dev-lang/ghc/ghc-5.04.3-r1.ebuild index ddde9a8bfac9..c51f83448eec 100644 --- a/dev-lang/ghc/ghc-5.04.3-r1.ebuild +++ b/dev-lang/ghc/ghc-5.04.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.3-r1.ebuild,v 1.2 2003/05/22 06:52:30 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.3-r1.ebuild,v 1.3 2003/07/02 11:01:11 kosmikus Exp $ #Some explanation of bootstrap logic: # @@ -95,23 +95,27 @@ GHCPATH="${PATH}:/opt/ghc/bin" src_unpack() { base_src_unpack - # Create our own lndir if none installed. + # apply patch to Linker.c to fix a problem with undefined symbols + # when starting GHCi + patch -p0 < ${FILESDIR}/ghc-5.04.3-r1.patch + +} + +src_compile() { local LNDIR + local myconf + + # Create GHC's lndir if none installed + if which lndir; then LNDIR=lndir else - # Current directory should be $WORKDIR. - echo "You don\'t seem to have lndir available, building my own" - echo "version..." - cp ${FILESDIR}/lndir.c . || die - make lndir || die - LNDIR=./lndir + echo "You don\'t seem to have lndir available (yet) ..." + PATH="${GHCPATH}" econf || die "lndir configure failed" + make glafp-utils || die "glafp-utils make failed" + LNDIR="${S}/glafp-utils/lndir/lndir" fi - # apply patch to Linker.c to fix a problem with undefined symbols - # when starting GHCi - patch -p0 < ${FILESDIR}/ghc-5.04.3-r1.patch - # Create build directories. if test x$need_stage1 = xyes; then echo '>>> Creating stage 1 build dir' @@ -122,10 +126,6 @@ src_unpack() { mkdir ${STAGE2_B} || die ${LNDIR} ${S} ${STAGE2_B} || die -} - -src_compile() { - local myconf use opengl && myconf="--enable-hopengl" || myconf="--disable-hopengl" if test x$need_stage1 = xyes; then |