[gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-6.4.2.ebuild ChangeLog ghc-6.2.2.ebuild

[Duncan Coutts (dcoutts)]

dcoutts     07/11/05 10:27:49

  Modified:             ghc-6.4.2.ebuild ChangeLog ghc-6.2.2.ebuild
  Log:
  Use new unified ghc ebuild for 6.2.2 and 6.4.2.
  (Portage version: 2.1.3.16)

Revision  Changes    Path
1.23                 dev-lang/ghc/ghc-6.4.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?r1=1.22&r2=1.23

Index: ghc-6.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ghc-6.4.2.ebuild	5 Nov 2007 02:18:21 -0000	1.22
+++ ghc-6.4.2.ebuild	5 Nov 2007 10:27:49 -0000	1.23
@@ -1,18 +1,20 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.22 2007/11/05 02:18:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.23 2007/11/05 10:27:49 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
+# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
+# where ghc-bin was primarily used for bootstrapping purposes.
+# From now on, these two ebuilds have been combined, with the
+# binary USE flag used to determine whether or not the pre-built
+# binary package should be emerged or whether ghc should be compiled
+# from source.  If the latter, then the relevant ghc-bin for the
+# arch in question will be used in the working directory to compile
+# ghc from source.
 #
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
+# This solution has the advantage of allowing us to retain the one
+# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -26,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs autotools ghc-package check-reqs
+inherit base eutils flag-o-matic toolchain-funcs autotools ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -38,60 +40,49 @@
 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
-		test? ( http://haskell.org/ghc/dist/ghc-testsuite-${MY_PV}.tar.gz )
-		mirror://gentoo/${P}-alut.patch.gz"
+SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2 )
+		 doc? 	( mirror://gentoo/${P}-libraries.tar.gz
+				  mirror://gentoo/${P}-users_guide.tar.gz )
+		 alpha?	( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
+		 amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
+		 hppa?	( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )
+		 ia64?	( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )
+		 ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )
+		 ppc64?	( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )
+		 sparc?	( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )
+		 x86?	( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )
+		 x86-fbsd?	( mirror://gentoo/ghc-bin-${PV}-x86-fbsd.tbz2 )
+		 test? ( http://haskell.org/ghc/dist/ghc-testsuite-${MY_PV}.tar.gz )
+		 mirror://gentoo/${P}-alut.patch.gz"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="test doc X opengl openal"
+IUSE="binary doc ghcbootstrap test X opengl openal"
 
+LOC="/opt/ghc" # location for installation of binary version
 S="${WORKDIR}/${MY_P}"
 
 PROVIDE="virtual/ghc"
 
 RDEPEND="
+	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2
-	X? ( x11-libs/libX11 )
+	=sys-libs/readline-5*
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
 	opengl? ( virtual/opengl
 			  virtual/glu virtual/glut
 			  openal? ( media-libs/openal media-libs/freealut ) )"
 
-# ghc cannot usually be bootstrapped using later versions ...
-DEPEND="${RDEPEND}
-	<virtual/ghc-6.5
-	!>=virtual/ghc-6.6
-	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 )"
+DEPEND="${RDEPEND}"
+# In the ghcbootstrap case we rely on the developer having
+# >=ghc-5.04.3 on their $PATH already
 
 PDEPEND=">=dev-haskell/cabal-1.1.4"
 
-pkg_setup() {
-	if use openal && ! use opengl; then
-		ewarn "The OpenAL bindings require the OpenGL bindings, however"
-		ewarn "USE=\"-opengl\" so the OpenAL bindings will not be built."
-		ewarn "To build the OpenAL bindings emerge with USE=\"openal opengl\""
-	fi
-
-	# 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.
-	#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
-}
-
 append-ghc-cflags() {
 	local flag compile assemble link
 	for flag in $*; do
@@ -146,130 +137,220 @@
 	append-ghc-cflags assemble		"-Wa,--noexecstack"
 }
 
-ghc_setup_wrapper() {
-	echo '#!/bin/sh'
-	echo "GHCBIN=\"$(ghc-libdir)/ghc-$1\";"
-	echo "TOPDIROPT=\"-B$(ghc-libdir)\";"
-	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
-	echo '# Mini-driver for GHC'
-	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
+pkg_setup() {
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages for"
+		ewarn "use with the ghc ebuild's USE=\"binary\" feature."
+		use binary && \
+			die "USE=\"ghcbootstrap binary\" is not a valid combination."
+		use doc && \
+			die "USE=\"ghcbootstrap doc\" is not a valid combination"
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	fi
+
+	if use openal && ! use opengl; then
+		ewarn "The OpenAL bindings require the OpenGL bindings, however"
+		ewarn "USE=\"-opengl\" so the OpenAL bindings will not be built."
+		ewarn "To build the OpenAL bindings emerge with USE=\"openal opengl\""
+	fi
+
+	if use binary; then
+		if use opengl || use openal || use X || use test; then
+			ewarn "The binary build does not include the X, OpenGL"
+			ewarn "or OpenAL bindings and does not support the testsuite."
+			ewarn "If you want those features, emerge with USE=\"-binary\""
+		fi
+	fi
+
+	set_config
+}
+
+set_config() {
+	# make this a separate function and call it several times as portage doesn't
+	# remember the variables properly between the fuctions.
+	use binary && GHC_PREFIX="/opt/ghc" || GHC_PREFIX="/usr"
 }
 
 src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
 	base_src_unpack
 	ghc_setup_cflags
 
-	cd "${S}"
-	epatch "${WORKDIR}/${P}-alut.patch"
-	epatch "${FILESDIR}/${P}-sparc32plus.patch"
-	epatch "${FILESDIR}/${P}-sparcmangler.patch"
-
-	# Modify the ghc driver script to use GHC_CFLAGS
-	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
-	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
-	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
-
-	# If we're using the testsuite then move it to into the build tree
-	use test && mv "${WORKDIR}/testsuite" "${S}/"
-
-	# Patch to fix a mis-compilation in the rts due to strict aliasing,
-	# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
-	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
+	if use binary; then
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
 
-	# Don't strip binaries on install. See QA warnings in bug #140369.
-	sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
+		# Relocate from /usr to /opt/ghc
+		sed -i -e "s|/usr|${LOC}|g" \
+			"${S}/usr/bin/ghc-${PV}" \
+			"${S}/usr/bin/ghci-${PV}" \
+			"${S}/usr/bin/ghc-pkg-${PV}" \
+			"${S}/usr/bin/hsc2hs" \
+			"${S}/usr/$(get_libdir)/${P}/package.conf" \
+			|| die "Relocating ghc from /usr to /opt/ghc failed"
+
+
+		# fix docs
+		if use doc; then
+			# correct the documentation and .haddock files path
+			sed -i -e \
+				"s|/opt/ghc/share/doc/${P}/html/libraries|/usr/share/doc/${P}/html/libraries|g" \
+				"${S}/usr/$(get_libdir)/${P}/package.conf"
+		else
+			# remove all doc stuff from package.conf
+			sed -i \
+				-e 's|haddockInterfaces = \[[^]]*\]|haddockInterfaces = \[\]|g' \
+				-e "s|haddockHTMLs = \[[^]]*\]|haddockHTMLs = \[\]|g" \
+				"${S}/usr/$(get_libdir)/${P}/package.conf"
+		fi
+
+		sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+			"${S}/usr/bin/ghcprof"
+
+	else
+
+		cd "${S}"
+		epatch "${WORKDIR}/${P}-alut.patch"
+		epatch "${FILESDIR}/${P}-sparc32plus.patch"
+		epatch "${FILESDIR}/${P}-sparcmangler.patch"
+
+		# Modify the ghc driver script to use GHC_CFLAGS
+		echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
+		echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
+		sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
+
+		if ! use ghcbootstrap; then
+			# Relocate from /usr to ${WORKDIR}/usr
+			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
+				"${WORKDIR}/usr/bin/ghc-${PV}" \
+				"${WORKDIR}/usr/bin/ghci-${PV}" \
+				"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
+				"${WORKDIR}/usr/bin/hsc2hs" \
+				"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
+				|| die "Relocating ghc from /usr to workdir failed"
+		fi
+
+		# If we're using the testsuite then move it to into the build tree
+		use test && mv "${WORKDIR}/testsuite" "${S}/"
+
+		# Patch to fix a mis-compilation in the rts due to strict aliasing,
+		# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
+		echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
+
+		# Don't strip binaries on install. See QA warnings in bug #140369.
+		sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
+	fi
 }
 
 src_compile() {
-	# initialize build.mk
-	echo '# Gentoo changes' > mk/build.mk
+	if ! use binary; then
 
-	# We also need to use the GHC_CFLAGS flags when building ghc itself
-	echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-	echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
-
-	# If you need to do a quick build then enable this bit and add debug to IUSE
-	#if use debug; then
-	#	echo "SRC_HC_OPTS     = -H32m -O0" >> mk/build.mk
-	#	echo "GhcStage1HcOpts =" >> mk/build.mk
-	#	echo "GhcLibHcOpts    =" >> mk/build.mk
-	#	echo "GhcLibWays      =" >> mk/build.mk
-	#	echo "SplitObjs       = NO" >> mk/build.mk
-	#fi
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
 
-	# determine what to do with documentation
-	if use doc; then
-		echo XMLDocWays="html" >> mk/build.mk
-	else
-		echo XMLDocWays="" >> mk/build.mk
+		# We also need to use the GHC_CFLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
+
+		# If you need to do a quick build then enable this bit and add debug to IUSE
+		#if use debug; then
+		#	echo "SRC_HC_OPTS     = -H32m -O -fasm" >> mk/build.mk
+		#	echo "GhcLibHcOpts    =" >> mk/build.mk
+		#	echo "GhcLibWays      =" >> mk/build.mk
+		#	echo "SplitObjs       = NO" >> mk/build.mk
+		#fi
+
+		# We can't depend on haddock so we never build docs
+		# and we rely on pre-built ones instead
+		echo SGMLDocWays="" >> mk/build.mk
 		# needed to prevent haddock from being called
 		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-
-	# circumvent a very strange bug that seems related with ghc producing too much
-	# output while being filtered through tee (e.g. due to portage logging)
-	# reported as bug #111183
-	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
-
-	# And some arches used to work ok, but bork with recent gcc versions
-	# See bug #145466 for ppc64.
-	if use ia64 || use ppc64; then
-		echo "GhcUnregisterised=YES" >> mk/build.mk
-		echo "GhcRTSWays := debug" >> mk/build.mk
-	fi
 
-	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
-	chmod +x "${T}/ghc.sh"
+		# circumvent a very strange bug that seems related with ghc producing too much
+		# output while being filtered through tee (e.g. due to portage logging)
+		# reported as bug #111183
+		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
+
+		# And some arches used to work ok, but bork with recent gcc versions
+		# See bug #145466 for ppc64.
+		if use ia64 || use ppc64; then
+			echo "GhcUnregisterised=YES" >> mk/build.mk
+			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+			echo "GhcWithInterpreter=NO" >> mk/build.mk
+			echo "SplitObjs=NO" >> mk/build.mk
+			echo "GhcRTSWays := debug" >> mk/build.mk
+		fi
 
-	# We've patched some configure.ac files to fix the OpenAL/ALUT bindings.
-	# So we need to autoreconf.
-	eautoreconf
-
-	econf \
-		--with-ghc="${T}/ghc.sh" \
-		$(use_enable opengl opengl) \
-		$(use_enable opengl glut) \
-		$(use openal && use opengl \
-			&& echo --enable-openal --enable-alut \
-			|| echo --disable-openal --disable-alut) \
-		$(use_enable X x11) \
-		$(use_enable X hgl) \
-		|| die "econf failed"
-
-	emake 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 ...
+		# We've patched some configure.ac files to fix the OpenAL/ALUT bindings.
+		# So we need to autoreconf.
+		eautoreconf
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		use ghcbootstrap || \
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+
+		econf \
+			$(use_enable opengl opengl) \
+			$(use_enable opengl glut) \
+			$(use openal && use opengl \
+				&& echo --enable-openal --enable-alut \
+				|| echo --disable-openal --disable-alut) \
+			$(use_enable X x11) \
+			$(use_enable X hgl) \
+			|| die "econf failed"
+
+		emake all datadir="/usr/share/doc/${P}" || die "make failed"
+		# the explicit datadir is required to make the haddock entries
+		# in the package.conf file point to the right place ...
 
+	fi # ! use binary
 }
 
-src_install () {
-	local insttarget
+src_install() {
+	if use binary; then
+		mkdir "${D}/opt"
+		mv "${S}/usr" "${D}/opt/ghc"
 
-	insttarget="install"
-	use doc && insttarget="${insttarget} install-docs"
+		cp -p "${D}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"{,.shipped} \
+			|| die "failed to copy package.conf"
 
-	# 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
-	# TODO: does this actually work?
-	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
+		doenvd "${FILESDIR}/10ghc"
+	else
+		# the libdir0 setting is needed for amd64, and does not
+		# harm for other arches
+		#TODO: are any of these overrides still required? isn't econf enough?
+		emake -j1 install \
+			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 install failed"
+
+		cd "${S}/ghc"
+		dodoc README ANNOUNCE LICENSE VERSION
 
-	cd "${S}/ghc"
-	dodoc README ANNOUNCE LICENSE VERSION
+		dosbin "${FILESDIR}/ghc-updater"
 
-	dosbin "${FILESDIR}/ghc-updater"
+		cp -p "${D}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"{,.shipped} \
+			|| die "failed to copy package.conf"
+	fi
+
+	if use doc; then
+		docinto "html/libraries"
+		dohtml -A haddock -r "${WORKDIR}/libraries/"* \
+			|| die "installing library docs failed"
+		docinto "html/users_guide"
+		dohtml -r "${WORKDIR}/users_guide/"* \
+			|| die "installing user guide failed"
+		docinto ""
+	fi
 }
 
 pkg_postinst () {
@@ -277,16 +358,39 @@
 	$(ghc-getghcpkg) unregister Cabal > /dev/null
 	eend $?
 	ghc-reregister
-	elog "If you have dev-lang/ghc-bin installed, you might"
-	elog "want to unmerge it. It is no longer needed."
-	elog
+
+	if use binary; then
+		elog "The envirenment has been set to use the binary distribution of"
+		elog "GHC. In order to activate it please run:"
+		elog "   env-update && source /etc/profile"
+		elog "Otherwise this setting will become active the next time you login"
+	fi
+
 	ewarn "IMPORTANT:"
 	ewarn "If you have upgraded from another version of ghc or"
-	ewarn "if you have switched from ghc-bin to ghc, please run:"
-	ewarn "	/usr/sbin/ghc-updater"
+	ewarn "if you have switched between binary and source versions"
+	ewarn "of ghc, please run:"
+	if use binary; then
+		ewarn "      /opt/ghc/sbin/ghc-updater"
+	else
+		ewarn "      /usr/sbin/ghc-updater"
+	fi
 	ewarn "to re-merge all ghc-based Haskell libraries."
 }
 
+pkg_prerm() {
+	# Overwrite the (potentially) modified package.conf with a copy of the
+	# original one, so that it will be removed during uninstall.
+
+	set_config # load GHC_PREFIX
+
+	PKG="${ROOT}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"
+
+	cp -p "${PKG}"{.shipped,}
+
+	[[ -f ${PKG}.old ]] && rm "${PKG}.old"
+}
+
 src_test() {
 	if use test; then
 		local summary



1.140                dev-lang/ghc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.139&r2=1.140

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog	5 Nov 2007 02:18:21 -0000	1.139
+++ ChangeLog	5 Nov 2007 10:27:49 -0000	1.140
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.139 2007/11/05 02:18:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.140 2007/11/05 10:27:49 dcoutts Exp $
+
+  05 Nov 2007; Duncan Coutts <dcoutts@g.o> ghc-6.2.2.ebuild,
+  ghc-6.4.2.ebuild:
+  Use new unified ghc ebuild for 6.2.2 and 6.4.2. This merges the
+  functionality of ghc-bin into the ghc ebuild and eliminates virtual/ghc.
+  To get the binary version emerge with the "binary" USE flag.
 
   05 Nov 2007; Duncan Coutts <dcoutts@g.o> ghc-6.6.1.ebuild:
   Add sparc and ppc binaries. Also fix some var quoting QA warnings.



1.25                 dev-lang/ghc/ghc-6.2.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?r1=1.24&r2=1.25

Index: ghc-6.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ghc-6.2.2.ebuild	5 Nov 2007 02:18:21 -0000	1.24
+++ ghc-6.2.2.ebuild	5 Nov 2007 10:27:49 -0000	1.25
@@ -1,18 +1,20 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.24 2007/11/05 02:18:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.25 2007/11/05 10:27:49 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
+# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
+# where ghc-bin was primarily used for bootstrapping purposes.
+# From now on, these two ebuilds have been combined, with the
+# binary USE flag used to determine whether or not the pre-built
+# binary package should be emerged or whether ghc should be compiled
+# from source.  If the latter, then the relevant ghc-bin for the
+# arch in question will be used in the working directory to compile
+# ghc from source.
 #
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
+# This solution has the advantage of allowing us to retain the one
+# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -31,42 +33,35 @@
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
 
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
+SRC_URI="!binary? ( http://haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )
+		 doc? 	( mirror://gentoo/${P}-libraries.tar.gz
+				  mirror://gentoo/${P}-users_guide.tar.gz )
+		 ppc?	( mirror://gentoo/ghc-bin-${PV}-r1-ppc.tbz2 )
+		 sparc?	( mirror://gentoo/ghc-bin-${PV}-r1-sparc.tbz2 )
+		 x86?	( mirror://gentoo/ghc-bin-${PV}-r1-x86.tbz2 )"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ppc sparc x86"
-IUSE="doc opengl"
+IUSE="binary doc ghcbootstrap opengl"
+
+LOC="/opt/ghc" # location for installation of binary version
 
 PROVIDE="virtual/ghc"
 
 RDEPEND="
+	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2
+	=sys-libs/readline-5*
 	opengl? ( virtual/opengl
 			  virtual/glu virtual/glut )"
 
-# ghc cannot usually be bootstrapped using later versions ...
-DEPEND="${RDEPEND}
-	<virtual/ghc-6.3
-	!>=virtual/ghc-6.4
-	doc? (  ~app-text/docbook-sgml-dtd-3.1
-			>=app-text/docbook-dsssl-stylesheets-1.64
-			>=app-text/openjade-1.3.1
-			>=app-text/sgml-common-0.6.3
-			>=dev-haskell/haddock-0.6-r2 )"
-
-pkg_setup() {
-	if test $(gcc-major-version) -gt 3; then
-		eerror "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
-		eerror "You can either use gcc-config to switch to gcc-3.x"
-		eerror "or you emerge '>=dev-lang/ghc-6.4' or later."
-		die "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
-	fi
-}
+DEPEND="${RDEPEND}"
+# In the ghcbootstrap case we rely on the developer having
+# >=ghc-5.04.3 on their $PATH already
 
 append-ghc-cflags() {
 	local flag compile assemble link
@@ -118,113 +113,208 @@
 	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
 }
 
-ghc_setup_wrapper() {
-	echo '#!/bin/sh'
-	echo "GHCBIN=\"$(ghc-libdir)/ghc-$1\";"
-	echo "TOPDIROPT=\"-B$(ghc-libdir)\";"
-	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
-	echo '# Mini-driver for GHC'
-	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
+pkg_setup() {
+	if test $(gcc-major-version) -gt 3; then
+		eerror "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
+		eerror "You can either use gcc-config to switch to gcc-3.x"
+		eerror "or you emerge '>=dev-lang/ghc-6.4' or later."
+		die "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
+	fi
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages for"
+		ewarn "use with the ghc ebuild's USE=\"binary\" feature."
+		use binary && \
+			die "USE=\"ghcbootstrap binary\" is not a valid combination."
+		use doc && \
+			die "USE=\"ghcbootstrap doc\" is not a valid combination"
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	fi
+
+	if use binary; then
+		if use opengl || use doc; then
+			ewarn "The binary build does not include the docs or OpenGL bindings"
+			ewarn "If you want those features, emerge with USE=\"-binary\""
+		fi
+	fi
+
+	set_config
+}
+
+set_config() {
+	# make this a separate function and call it several times as portage doesn't
+	# remember the variables properly between the fuctions.
+	use binary && GHC_PREFIX="/opt/ghc" || GHC_PREFIX="/usr"
 }
 
 src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
 	base_src_unpack
 	ghc_setup_cflags
 
-	# Modify the ghc driver script to use GHC_CFLAGS
-	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
-	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
-	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
-
-	# Patch to fix a mis-compilation in the rts due to strict aliasing,
-	# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
-	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
+	if use binary; then
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+
+		# Relocate from /usr to /opt/ghc
+		sed -i -e "s|/usr|${LOC}|g" \
+			"${S}/usr/bin/ghc-${PV}" \
+			"${S}/usr/bin/ghci-${PV}" \
+			"${S}/usr/bin/ghc-pkg-${PV}" \
+			"${S}/usr/bin/hsc2hs" \
+			"${S}/usr/$(get_libdir)/${P}/package.conf" \
+			|| die "Relocating ghc from /usr to /opt/ghc failed"
 
-	# Don't strip binaries on install. See QA warnings in bug #140369.
-	sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
+		sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+			"${S}/usr/bin/ghcprof"
+
+	else
+		# Modify the ghc driver script to use GHC_CFLAGS
+		echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
+		echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
+		sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
+
+		if ! use ghcbootstrap; then
+			# Relocate from /usr to ${WORKDIR}/usr
+			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
+				"${WORKDIR}/usr/bin/ghc-${PV}" \
+				"${WORKDIR}/usr/bin/ghci-${PV}" \
+				"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
+				"${WORKDIR}/usr/bin/hsc2hs" \
+				"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
+				|| die "Relocating ghc from /usr to workdir failed"
+		fi
+
+		# Patch to fix a mis-compilation in the rts due to strict aliasing,
+		# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
+		echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
+
+		# Don't strip binaries on install. See QA warnings in bug #140369.
+		sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
+	fi
 }
 
 src_compile() {
-	# initialize build.mk
-	echo '# Gentoo changes' > mk/build.mk
+	if ! use binary; then
 
-	# We also need to use the GHC_CFLAGS flags when building ghc itself
-	echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-	echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
 
-	# determine what to do with documentation
-	if use doc; then
-		echo SGMLDocWays="html" >> mk/build.mk
-	else
+		# We also need to use the GHC_CFLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
+
+		# We can't depend on haddock so we never build docs
+		# and we rely on pre-built ones instead
 		echo SGMLDocWays="" >> mk/build.mk
 		# needed to prevent haddock from being called
 		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
 
-	# circumvent a very strange bug that seems related with ghc producing too much
-	# output while being filtered through tee (e.g. due to portage logging)
-	# reported as bug #111183
-	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
-
-	# Required for some architectures, because they don't support ghc fully ...
-	use ppc || use sparc && echo "SplitObjs=NO" >> mk/build.mk
-	use sparc && echo "GhcWithInterpreter=NO" >> mk/build.mk
-
-	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
-	chmod +x "${T}/ghc.sh"
-
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	SGML_CATALOG_FILES="" econf \
-		--with-ghc="${T}/ghc.sh" \
-		$(use_enable opengl hopengl) \
-		|| die "econf failed"
-
-	# ghc-6.2.x build system does not support parallel make
-	emake -j1 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 ...
+		# circumvent a very strange bug that seems related with ghc producing too much
+		# output while being filtered through tee (e.g. due to portage logging)
+		# reported as bug #111183
+		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
+
+		# Required for some architectures, because they don't support ghc fully ...
+		use ppc || use sparc && echo "SplitObjs=NO" >> mk/build.mk
+		use sparc && echo "GhcWithInterpreter=NO" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		use ghcbootstrap || \
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+
+		# Note that --disable-hopengl actually enables it. We have to ommit
+		# the flag to disable opengl.
+		econf \
+			$(use opengl && echo "--enable-hopengl") \
+			|| die "econf failed"
+
+		# ghc-6.2.x build system does not support parallel make
+		emake -j1 datadir="/usr/share/doc/${P}" || die "make failed"
+		# the explicit datadir is required to make the haddock entries
+		# in the package.conf file point to the right place ...
 
+	fi # ! use binary
 }
 
-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
-	# TODO: does this actually work?
-	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
+src_install() {
+	if use binary; then
+		mkdir "${D}/opt"
+		mv "${S}/usr" "${D}/opt/ghc"
+
+		cp -p "${D}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"{,.shipped} \
+			|| die "failed to copy package.conf"
+
+		doenvd "${FILESDIR}/10ghc"
+	else
+		# the libdir0 setting is needed for amd64, and does not
+		# harm for other arches
+		#TODO: are any of these overrides still required? isn't econf enough?
+		emake -j1 install \
+			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 install failed"
 
-	cd "${S}/ghc"
-	dodoc README ANNOUNCE LICENSE VERSION
+		cd "${S}/ghc"
+		dodoc README ANNOUNCE LICENSE VERSION
+
+		dosbin "${FILESDIR}/ghc-updater"
+
+		cp -p "${D}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"{,.shipped} \
+			|| die "failed to copy package.conf"
+	fi
 
-	dosbin "${FILESDIR}/ghc-updater"
+	if use doc; then
+		docinto "html/libraries"
+		dohtml -A haddock -r "${WORKDIR}/libraries/"* \
+			|| die "installing library docs failed"
+		docinto "html/users_guide"
+		dohtml -r "${WORKDIR}/users_guide/"* \
+			|| die "installing user guide failed"
+		docinto ""
+	fi
 }
 
 pkg_postinst () {
 	ghc-reregister
-	elog "If you have dev-lang/ghc-bin installed, you might"
-	elog "want to unmerge it. It is no longer needed."
-	elog
+
+	if use binary; then
+		elog "The envirenment has been set to use the binary distribution of"
+		elog "GHC. In order to activate it please run:"
+		elog "   env-update && source /etc/profile"
+		elog "Otherwise this setting will become active the next time you login"
+	fi
+
 	ewarn "IMPORTANT:"
 	ewarn "If you have upgraded from another version of ghc or"
-	ewarn "if you have switched from ghc-bin to ghc, please run:"
-	ewarn "	/usr/sbin/ghc-updater"
+	ewarn "if you have switched between binary and source versions"
+	ewarn "of ghc, please run:"
+	if use binary; then
+		ewarn "      /opt/ghc/sbin/ghc-updater"
+	else
+		ewarn "      /usr/sbin/ghc-updater"
+	fi
 	ewarn "to re-merge all ghc-based Haskell libraries."
 }
+
+pkg_prerm() {
+	# Overwrite the (potentially) modified package.conf with a copy of the
+	# original one, so that it will be removed during uninstall.
+
+	set_config # load GHC_PREFIX
+
+	PKG="${ROOT}/${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"
+
+	cp -p "${PKG}"{.shipped,}
+
+	[[ -f ${PKG}.old ]] && rm "${PKG}.old"
+}



-- 
gentoo-commits@g.o mailing list