diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:38:41 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:38:41 +0000 |
| commit | fb6bf19b452981c49bb0d7960f8be40b052e5f4f (patch) | |
| tree | 5befb23564b7678bdafc8085b670a6cb39d3c4ea /dev-lang/ghc | |
| parent | add upstream patch for mips (diff) | |
| download | gentoo-2-fb6bf19b452981c49bb0d7960f8be40b052e5f4f.tar.gz gentoo-2-fb6bf19b452981c49bb0d7960f8be40b052e5f4f.tar.bz2 gentoo-2-fb6bf19b452981c49bb0d7960f8be40b052e5f4f.zip | |
Avoid errors for platforms we don't use Gentoo's binaries
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-lang/ghc')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-6.12.3-r2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index fe2ca5e416e7..010a9bd3a83e 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.219 2012/04/27 18:14:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.220 2012/04/30 15:38:41 grobian Exp $ + + 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> ghc-6.12.3-r2.ebuild: + Avoid errors for platforms we don't use Gentoo's binaries *ghc-7.4.1-r1 (27 Apr 2012) diff --git a/dev-lang/ghc/ghc-6.12.3-r2.ebuild b/dev-lang/ghc/ghc-6.12.3-r2.ebuild index 5d28f3f8ff12..ae9ddd88df3f 100644 --- a/dev-lang/ghc/ghc-6.12.3-r2.ebuild +++ b/dev-lang/ghc/ghc-6.12.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.7 2012/04/13 19:01:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.8 2012/04/30 15:38:41 grobian Exp $ # Brief explanation of the bootstrap logic: # @@ -225,7 +225,7 @@ src_prepare() { ghc_setup_cflags - if ! use ghcbootstrap; then + if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then # Modify the wrapper script from the binary tarball to use GHC_CFLAGS. # See bug #313635. sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_CFLAGS}|" \ |