Added new revision with a new binary tarball of ghc to fix gcc 4 issues on ppc64; bug #145466

(Portage version: 2.1.2.2)

3 files changed, 153 insertions, 1 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index 75bbe83a1793..1b8745c517aa 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ghc-bin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.64 2007/03/16 21:55:57 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.65 2007/03/29 14:53:37 corsair Exp $
+
+*ghc-bin-6.4.2-r1 (29 Mar 2007)
+
+  29 Mar 2007; Markus Rothe <corsair@gentoo.org> +ghc-bin-6.4.2-r1.ebuild:
+  Added new revision with a new binary tarball of ghc to fix gcc 4 issues on
+  ppc64; bug #145466
 
   16 Mar 2007; Lennart Kolmodin <kolmodin@gentoo.org> ghc-bin-6.6.ebuild:
   Version bump to 6.6
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.2-r1 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.2-r1
new file mode 100644
index 000000000000..703a67bc4a7a
--- /dev/null
+++ b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.2-r1
@@ -0,0 +1,3 @@
+MD5 b0d9b20584af489c01181da4c8fa46cb ghc-bin-6.4.2-r1-ppc64.tbz2 28803955
+RMD160 0bba1bbfae87722e2abab57fc7ad3e01b6e2be26 ghc-bin-6.4.2-r1-ppc64.tbz2 28803955
+SHA256 2502afb688468ea8f54ff076da8c0d33bd2508fb22996a9ae3e4a78fd9c2bc92 ghc-bin-6.4.2-r1-ppc64.tbz2 28803955
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild
new file mode 100644
index 000000000000..f42b06729c3d
--- /dev/null
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild,v 1.1 2007/03/29 14:53:37 corsair Exp $
+
+# Note to users of hardened gcc-3.x:
+#
+# If you emerge ghc-bin with hardened gcc it should work fine (because
+# we turn off the hardened features that would otherwise break ghc).
+# However, emerging ghc-bin while using a vanilla gcc and then switching
+# to hardened gcc (using gcc-config) will leave you with a broken ghc. To
+# fix it you would need to either switch back to vanilla gcc or re-emerge
+# ghc-bin (or ghc). Note that also if you are using hardened gcc-3.x and
+# you switch to gcc-4.x that this will also break ghc and you'll need to
+# re-emerge ghc-bin (or ghc). People using vanilla gcc can switch between
+# gcc-3.x and 4.x with no problems.
+
+inherit base multilib flag-o-matic toolchain-funcs ghc-package
+
+DESCRIPTION="Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+# list all arches for proper digest building:
+SRC_URI="ppc64?		( mirror://gentoo/${P}-r1-ppc64.tbz2 )"
+
+LICENSE="as-is"
+KEYWORDS="ppc64"
+SLOT="0"
+IUSE="" # use the non-binary version if you want to have more choice
+
+RESTRICT="nostrip" # already stripped
+
+LOC="/opt/ghc"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=sys-devel/gcc-2.95.3
+	>=dev-libs/gmp-4.1
+	=sys-libs/readline-5*"
+
+PROVIDE="virtual/ghc"
+
+S="${WORKDIR}"
+
+append-ghc-cflags() {
+	local flag compile assemble link
+	for flag in $*; do
+		case ${flag} in
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
+				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
+				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
+		esac
+	done
+}
+
+ghc_setup_cflags() {
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -fPIC
+
+	GHC_CFLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Debugging flags don't help either. You can't debug Haskell code
+			# at the C source level and the mangler discards the debug info.
+			-g*) ;;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	# hardened-gcc needs to be disabled, because the mangler doesn't accept
+	# its output.
+	gcc-specs-pie && append-ghc-cflags compile link	-nopie
+	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
+
+	# We also add -Wa,--noexecstack to get ghc to generate .o files with
+	# non-exectable stack. This it a hack until ghc does it itself properly.
+	append-ghc-cflags assemble "-Wa,--noexecstack"
+}
+
+ghc_setup_wrapper() {
+	echo '#!/bin/bash'
+	echo "GHCBIN=\"${LOC}/$(get_libdir)/ghc-$1/ghc-$1\";"
+	echo "TOPDIROPT=\"-B${LOC}/$(get_libdir)/ghc-$1\";"
+	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
+	echo '# Mini-driver for GHC'
+	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
+}
+
+src_unpack() {
+	base_src_unpack
+
+	# Setup the ghc wrapper script
+	ghc_setup_cflags
+	ghc_setup_wrapper ${PV} > "${S}/usr/bin/ghc-${PV}"
+
+	# Relocate from /usr to /opt/ghc
+	sed -i -e "s|/usr|${LOC}|g" \
+		"${S}/usr/bin/ghci-${PV}" \
+		"${S}/usr/bin/ghc-pkg-${PV}" \
+		"${S}/usr/bin/hsc2hs" \
+		"${S}/usr/$(get_libdir)/ghc-${PV}/package.conf"
+
+	sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+		"${S}/usr/bin/ghcprof"
+}
+
+src_compile() {
+	true
+}
+
+src_install () {
+	mkdir "${D}/opt"
+	mv "${S}/usr" "${D}/opt/ghc"
+
+	insinto /etc/env.d
+	doins "${FILESDIR}/10ghc"
+}
+
+pkg_postinst () {
+	ghc-reregister
+	ewarn "IMPORTANT:"
+	ewarn "If you have upgraded from another version of ghc-bin or"
+	ewarn "if you have switched from ghc to ghc-bin, please run:"
+	ewarn "	/opt/ghc/sbin/ghc-updater"
+	ewarn "to re-merge all ghc-based Haskell libraries."
+}