Add new revision ghc-6.4.1-r1 which now PDEPENDs on cabal.
authorDuncan Coutts <dcoutts@gentoo.org>
Fri, 21 Oct 2005 11:25:42 +0000 (11:25 +0000)
committerDuncan Coutts <dcoutts@gentoo.org>
Fri, 21 Oct 2005 11:25:42 +0000 (11:25 +0000)
Package-Manager: portage-2.0.51.22-r3

dev-lang/ghc/ChangeLog
dev-lang/ghc/Manifest
dev-lang/ghc/files/digest-ghc-6.4.1-r1 [new file with mode: 0644]
dev-lang/ghc/ghc-6.4.1-r1.ebuild [new file with mode: 0644]

index 8e9584db32921bbe8493d61eadeaba824145a39b..75bb75df54dae03d53d4cc0365098440d19b15b2 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.72 2005/10/06 18:11:25 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.73 2005/10/21 11:25:42 dcoutts Exp $
+
+*ghc-6.4.1-r1 (21 Oct 2005)
+
+  21 Oct 2005; <duncan@gentoo.org> +ghc-6.4.1-r1.ebuild:
+  Add new revision ghc-6.4.1-r1 which now PDEPENDs on cabal.
 
   06 Oct 2005; <duncan@gentoo.org> ghc-6.4.1.ebuild:
   Revert to using virtual/ghc in DEPEND since the other method had no advantages.
index 681260dce38c961550991b263ae2b4a639907c5c..75297e7fad31a37d03dd39f4618321711fae5390 100644 (file)
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9dd2d4469df37616f8133d14b58a2ff7 ChangeLog 12935
+MD5 670ea0013a01dc7771a7ee918ae62187 ghc-6.4.1.ebuild 5943
+MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
+MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
+MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
+MD5 096c7e091b383a94afd2a3483545c98f ghc-6.4.1-r1.ebuild 5982
+MD5 ac3dfa5ebb04b0461ee5412e35140cf8 ChangeLog 13083
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 af174f2e566a288f0e2276883a866827 files/ghc-updater 9075
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
+MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
+MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
+MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1-r1 67
 MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67
 MD5 9e9c22452b545fd9ec1367155c15d8e2 files/digest-ghc-6.2.2 67
-MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
 MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1 67
+MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
 MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
-MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
-MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
-MD5 af174f2e566a288f0e2276883a866827 files/ghc-updater 9075
-MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
-MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
-MD5 670ea0013a01dc7771a7ee918ae62187 ghc-6.4.1.ebuild 5943
-MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDRs29I1lqEGTUzyQRAqhmAJwKgc+7tGaHH0itu9sBiceOY95BbQCgj67+
-ElMSmjPwkk6eO9FGaKqP27o=
-=qDx7
+iD8DBQFDWNCqkyZuKN4EQ6YRAl6IAJ4yov3BA/RaIBPPPuxBTQcnA8DUNQCfcqVN
+Q83sYtCJ3l5nN4Q7Zf5W6M0=
+=GMuE
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1-r1 b/dev-lang/ghc/files/digest-ghc-6.4.1-r1
new file mode 100644 (file)
index 0000000..1581d6c
--- /dev/null
@@ -0,0 +1 @@
+MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/ghc-6.4.1-r1.ebuild b/dev-lang/ghc/ghc-6.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..474d5c3
--- /dev/null
@@ -0,0 +1,209 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/10/21 11:25:42 dcoutts Exp $
+
+# Brief explanation of the bootstrap logic:
+#
+# ghc requires ghc-bin to bootstrap.
+# Therefore, 
+# (1) both ghc-bin and ghc provide virtual/ghc
+# (2) virtual/ghc *must* default to ghc-bin
+# (3) ghc depends on virtual/ghc
+#
+# This solution has the advantage that the binary distribution
+# can be removed once an forall after the first succesful install
+# of ghc.
+
+inherit base flag-o-matic eutils ghc-package
+
+IUSE="doc opengl"
+#java use flag disabled because of bug #106992
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# discover if this is a snapshot release
+IS_SNAPSHOT="${PV%%*pre*}" # zero if snapshot
+MY_PV="${PV/_pre/.}"
+MY_P="${PN}-${MY_PV}"
+EXTRA_SRC_URI="${MY_PV}"
+[[ -z "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
+
+SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+# re-add ~ppc64 once dependencies are fulfilled
+KEYWORDS="-alpha ~amd64 ~x86 ~sparc ~ppc"
+
+S="${WORKDIR}/${MY_P}"
+
+PROVIDE="virtual/ghc"
+
+# ghc cannot usually be bootstrapped using later versions ...
+DEPEND="<virtual/ghc-6.5
+       !>=virtual/ghc-6.6
+       >=dev-lang/perl-5.6.1
+       >=sys-devel/gcc-2.95.3
+       >=sys-devel/make-3.79.1
+       >=sys-apps/sed-3.02.80
+       >=sys-devel/flex-2.5.4a
+       >=dev-libs/gmp-4.1
+       >=sys-libs/readline-4.2
+       doc? (  ~app-text/docbook-xml-dtd-4.2
+               app-text/docbook-xsl-stylesheets
+               >=dev-libs/libxslt-1.1.2
+               >=dev-haskell/haddock-0.6-r2 )
+       opengl? ( virtual/opengl
+               virtual/glu
+               virtual/glut )"
+# removed: java? ( >=dev-java/fop-0.20.5 )
+
+RDEPEND="virtual/libc
+       >=sys-devel/gcc-2.95.3
+       >=dev-lang/perl-5.6.1
+       >=dev-libs/gmp-4.1
+       >=sys-libs/readline-4.2
+       opengl? ( virtual/opengl virtual/glu virtual/glut )"
+
+PDEPEND=">=dev-haskell/cabal-1.1.3"
+
+SUPPORTED_CFLAGS=""
+
+# Setup supported CFLAGS.
+check_cflags() {
+       OLD_CFLAGS="${CFLAGS}"
+       CFLAGS="$1"
+       strip-unsupported-flags
+       SUPPORTED_CFLAGS="${SUPPORTED_CFLAGS} ${CFLAGS}"
+       CFLAGS="${OLD_CFLAGS}"
+}
+
+setup_cflags() {
+       check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
+}
+
+# Portage's resolution of virtuals fails on virtual/ghc in some Portage releases,
+# the following function causes the build to fail with an informative error message
+# in such a case.
+# pkg_setup() {
+#      if ! has_version virtual/ghc; then
+#              eerror "This ebuild needs a version of GHC to bootstrap from."
+#              eerror "Please emerge dev-lang/ghc-bin to get a binary version."
+#              eerror "You can either use the binary version directly or emerge"
+#              eerror "dev-lang/ghc afterwards."
+#              die "virtual/ghc version required to build"
+#      fi
+# }
+
+src_unpack() {
+       base_src_unpack
+
+       # TODO: test if ppc/ppc64 works without patch now ...
+
+       # hardened-gcc needs to be disabled, because the
+       # mangler doesn't accept its output; yes, the 6.2 version
+       # should do ...
+       cd "${S}/ghc/driver"
+       setup_cflags
+
+       epatch "${FILESDIR}/${PN}-6.2.hardened.patch"
+       sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghc/ghc.sh
+       sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghci/ghci.sh
+}
+
+src_compile() {
+       local myconf
+       local mydoc
+
+       if use opengl; then
+               myconf="--enable-hopengl"
+       fi
+
+       # initialize build.mk
+       echo '# Gentoo changes' > mk/build.mk
+
+       # determine what to do with documentation
+       if use doc; then
+               mydoc="html"
+#              if use java; then
+#                      mydoc="${mydoc} ps"
+#              fi
+       else
+               mydoc=""
+               # needed to prevent haddock from being called
+               echo NO_HADDOCK_DOCS=YES >> mk/build.mk
+       fi
+       echo XMLDocWays="${mydoc}" >> mk/build.mk
+
+       # disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
+       # thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
+       # (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)
+       setup_cflags
+       echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
+       echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS// -/ -optc-}" >> mk/build.mk
+
+       # force the config variable ArSupportsInput to be unset;
+       # ar in binutils >= 2.14.90.0.8-r1 seems to be classified
+       # incorrectly by the configure script
+       echo "ArSupportsInput:=" >> mk/build.mk
+
+       # Required for some architectures, because they don't support ghc fully ...
+       use ppc || use ppc64 || use sparc && echo "SplitObjs=NO" >> mk/build.mk
+       use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
+
+       econf ${myconf} || die "econf failed"
+
+       # the build does not seem to work all that
+       # well with parallel make
+       emake -j1 all datadir="/usr/share/doc/${PF}" || die "make failed"
+       # the explicit datadir is required to make the haddock entries
+       # in the package.conf file point to the right place ...
+
+}
+
+src_install () {
+       local insttarget
+
+       insttarget="install"
+       use doc && insttarget="${insttarget} install-docs"
+
+       # the libdir0 setting is needed for amd64, and does not
+       # harm for other arches
+       emake -j1 ${insttarget} \
+               prefix="${D}/usr" \
+               datadir="${D}/usr/share/doc/${PF}" \
+               infodir="${D}/usr/share/info" \
+               mandir="${D}/usr/share/man" \
+               libdir0="${D}/usr/$(get_libdir)" \
+               || die "make ${insttarget} failed"
+
+       #need to remove ${D} from ghcprof script
+       cd "${D}/usr/bin"
+       mv ghcprof ghcprof-orig
+       sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
+       chmod a+x ghcprof
+       rm -f ghcprof-orig
+
+       cd "${S}/ghc"
+       dodoc README ANNOUNCE LICENSE VERSION
+
+       dosbin ${FILESDIR}/ghc-updater
+}
+
+pkg_postinst () {
+       ebegin "Unregistering ghc's built-in cabal "
+       $(ghc-getghcpkg) unregister Cabal > /dev/null
+       eend $?
+       ghc-reregister
+       einfo "If you have dev-lang/ghc-bin installed, you might"
+       einfo "want to unmerge it. It is no longer needed."
+       einfo
+       ewarn "IMPORTANT:"
+       ewarn "If you upgrade from another ghc version, please run"
+       ewarn "/usr/sbin/ghc-updater to re-merge all ghc-based"
+       ewarn "Haskell libraries."
+}
+