diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-03-25 15:02:29 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-03-25 15:03:20 +0000 |
| commit | 91a677801a2256a7cd061346479720ee3d8041f1 (patch) | |
| tree | aa3d0f6983fca8c596272592b55bce59891f42e1 /eclass | |
| parent | sys-apps/pcsc-tools: Remove old (diff) | |
| download | gentoo-91a677801a2256a7cd061346479720ee3d8041f1.tar.gz gentoo-91a677801a2256a7cd061346479720ee3d8041f1.tar.bz2 gentoo-91a677801a2256a7cd061346479720ee3d8041f1.zip | |
haskell-cabal.eclass: allow EAPI=6, add trivial Setup.hs autogeneration
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/haskell-cabal.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 334b243c447d..373507995f36 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -73,7 +73,7 @@ HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install pkg_postinst pkg_ QA_CONFIGURE_OPTIONS+=" --with-compiler --with-hc --with-hc-pkg --with-gcc" case "${EAPI:-0}" in - 2|3|4|5) HASKELL_CABAL_EXPF+=" src_configure" ;; + 2|3|4|5|6) HASKELL_CABAL_EXPF+=" src_configure" ;; *) ;; esac @@ -185,7 +185,9 @@ cabal-bootstrap() { elif [[ -f "${S}/Setup.hs" ]]; then setupmodule="${S}/Setup.hs" else - die "No Setup.lhs or Setup.hs found" + eqawarn "No Setup.lhs or Setup.hs found. Either add Setup.hs to package or call cabal-mksetup from ebuild" + cabal-mksetup + setupmodule="${S}/Setup.hs" fi if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then |