diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-08-06 08:20:33 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-08-06 08:20:33 +0000 |
| commit | aae70ff9da28d8bd07656801d34362ba375d98c1 (patch) | |
| tree | e2a8493d7148a0358c6a146956b7ff24f936d119 /eclass/haskell-cabal.eclass | |
| parent | Fix python implementation deps and urwid-1.3.0 compat (523030, 541936) (diff) | |
| download | historical-aae70ff9da28d8bd07656801d34362ba375d98c1.tar.gz historical-aae70ff9da28d8bd07656801d34362ba375d98c1.tar.bz2 historical-aae70ff9da28d8bd07656801d34362ba375d98c1.zip | |
Add new helpers: 'ghc-pm-version' to get ghc version as seen by package manager and 'ghc-is-dynamic' to workaround ghc-api bug https://ghc.haskell.org/trac/ghc/ticket/10301 in ebuild.
Diffstat (limited to 'eclass/haskell-cabal.eclass')
| -rw-r--r-- | eclass/haskell-cabal.eclass | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 22239bb46eef..e9eceaed0484 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.52 2015/07/20 15:05:49 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.53 2015/08/06 08:20:33 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -203,7 +203,7 @@ cabal-bootstrap() { make_setup() { set -- -package "${cabalpackage}" --make "${setupmodule}" \ - ${setup_bootstrap_args} \ + "${setup_bootstrap_args[@]}" \ ${HCFLAGS} \ ${GHC_BOOTSTRAP_FLAGS} \ "$@" \ @@ -487,12 +487,9 @@ cabal-pkg() { # CABAL_CORE_LIB_GHC_PV="7.10.* PM:7.8.4-r1". cabal-is-dummy-lib() { local bin_ghc_version=$(ghc-version) - local pm_ghc_p=$(best_version dev-lang/ghc) - local pm_ghc_version version + local pm_ghc_version=$(ghc-pm-version) - pm_ghc_version=PM:${pm_ghc_p#dev-lang/ghc-} - - for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do + for version in ${CABAL_CORE_LIB_GHC_PV}; do [[ "${bin_ghc_version}" == ${version} ]] && return 0 [[ "${pm_ghc_version}" == ${version} ]] && return 0 done |