diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-04-14 20:22:23 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-04-14 20:22:23 +0000 |
| commit | 2b75948f32bbc0d6f237731f0d2e62906dd30ce4 (patch) | |
| tree | 01baa0bfa0b2daf428f3f3bf9dd6c3025248550d /eclass | |
| parent | Add ~amd64-linux keyword. (diff) | |
| download | gentoo-2-2b75948f32bbc0d6f237731f0d2e62906dd30ce4.tar.gz gentoo-2-2b75948f32bbc0d6f237731f0d2e62906dd30ce4.tar.bz2 gentoo-2-2b75948f32bbc0d6f237731f0d2e62906dd30ce4.zip | |
move 'dev-haskell/cabal' santy check out from 'pkg_*' to 'src_*' function to allow binary installation. Reported by tamiko.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7f99334b574c..917c8d0e6a56 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.209 2012/04/14 19:30:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.210 2012/04/14 20:22:23 slyfox Exp $ + + 14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass: + move 'dev-haskell/cabal' santy check out from 'pkg_*' to 'src_*' function to + allow binary installation. Reported by tamiko. 14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass: fix -dynamic './setup configure' failures against newer libffi (bug #411789 diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 8d071eb597e7..671b6518d3ae 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -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/eclass/haskell-cabal.eclass,v 1.30 2012/04/14 19:30:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.31 2012/04/14 20:22:23 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -158,6 +158,13 @@ cabal-bootstrap() { die "No Setup.lhs or Setup.hs found" fi + if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then + eerror "The package dev-haskell/cabal is not correctly installed for" + eerror "the currently active version of ghc ($(ghc-version)). Please" + eerror "run haskell-updater or re-build dev-haskell/cabal." + die "cabal is not correctly installed" + fi + # We build the setup program using the latest version of # cabal that we have installed cabalpackage=Cabal-$(cabal-version) @@ -344,12 +351,6 @@ cabal-is-dummy-lib() { # exported function: check if cabal is correctly installed for # the currently active ghc (we cannot guarantee this with portage) haskell-cabal_pkg_setup() { - if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then - eerror "The package dev-haskell/cabal is not correctly installed for" - eerror "the currently active version of ghc ($(ghc-version)). Please" - eerror "run haskell-updater or re-build dev-haskell/cabal." - die "cabal is not correctly installed" - fi if [[ -z "${CABAL_HAS_BINARIES}" ]] && [[ -z "${CABAL_HAS_LIBRARIES}" ]]; then eqawarn "QA Notice: Neither bin nor lib are in CABAL_FEATURES." fi |