diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-11 11:18:53 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-11 11:18:53 +0000 |
| commit | 24b2471760a35870c85ca752666bcb66120289af (patch) | |
| tree | 9f0dd28cc3af261031184893ad4dbefb9cb6cad6 /eclass/haskell-cabal.eclass | |
| parent | 2502c34a847594fd68051817c7c19d8f0b81c595 (diff) | |
gentoo auto-resync : 11:12:2023 - 11:18:53
Diffstat (limited to 'eclass/haskell-cabal.eclass')
| -rw-r--r-- | eclass/haskell-cabal.eclass | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index a3e2da6155f3..7895d9256eba 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Original author: Andres Loeh <kosmikus@gentoo.org> # Original author: Duncan Coutts <dcoutts@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal) # @DESCRIPTION: # Basic instructions: @@ -35,15 +35,13 @@ # package it might cause cause the test-suite to fail with # errors like: # > <command line>: cannot satisfy -package-id singletons-2.7-3Z7pnljD8tU1NrslJodXmr -# Workaround re-reginsters the package to avoid the failure +# Workaround re-registers the package to avoid the failure # (and rebuilds changes). # FEATURE can be removed once https://github.com/haskell/cabal/issues/7213 # is fixed. case ${EAPI} in - # eutils is for eqawarn - 6) inherit eutils ;; - 8|7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -99,7 +97,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_test src_in # CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests" : "${CABAL_EXTRA_HSCOLOUR_FLAGS:=}" - # @ECLASS_VARIABLE: CABAL_EXTRA_TEST_FLAGS # @USER_VARIABLE # @DESCRIPTION: @@ -157,7 +154,7 @@ S="${WORKDIR}/${CABAL_P}" # @DESCRIPTION: # The location of the .cabal file for the Haskell package. This defaults to # "${S}/${CABAL_PN}.cabal". -# +# # NOTE: If $S is redefined in the ebuild after inheriting this eclass, # $CABAL_FILE will also need to be redefined as well. : "${CABAL_FILE:="${S}/${CABAL_PN}.cabal"}" @@ -763,7 +760,7 @@ cabal_src_compile() { fi if [[ -n "${CABAL_REBUILD_AFTER_DOC_WORKAROUND}" ]]; then ewarn "rebuild-after-doc-workaround is enabled. This is a" - ewarn "temporary worakround to deal with https://github.com/haskell/cabal/issues/7213" + ewarn "temporary workaround to deal with https://github.com/haskell/cabal/issues/7213" ewarn "until the upstream issue can be resolved." cabal-build fi @@ -1104,7 +1101,7 @@ cabal-register-inplace() { # needed by the executable. (Needed libraries are automatically added to # LD_LIBRARY_PATH by haskell-cabal_src_compile().) # -# This is only inteded to be run in the test and install phases. +# This is only intended to be run in the test and install phases. cabal-run-dist-bin() { einfo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}" case "$EBUILD_PHASE_FUNC" in |