mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
haskell-cabal.eclass: allow EAPI=6, add trivial Setup.hs autogeneration
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user