Date: Mon, 24 May 2021 06:32:06 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0da1ad3eb5be - main - Uses/cabal.mk: Make cabal-extract-deps target overridable. Message-ID: <202105240632.14O6W6q5089718@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0da1ad3eb5beb90ab1b86ff0e478a9ab0f08baca commit 0da1ad3eb5beb90ab1b86ff0e478a9ab0f08baca Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2021-05-24 06:29:14 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2021-05-24 06:32:02 +0000 Uses/cabal.mk: Make cabal-extract-deps target overridable. --- Mk/Uses/cabal.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index bc576b73d091..5154bcca81b3 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -156,14 +156,16 @@ cabal-extract: ${WRKDIR} # Fetches and unpacks dependencies sources for a cabal-extract'ed package. # Builds them as side-effect. +. if !target(cabal-extract-deps) cabal-extract-deps: -. if ${cabal_ARGS:Mhpack} +. if ${cabal_ARGS:Mhpack} cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack -. endif +. endif cd ${WRKSRC} && \ ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CONFIGURE_ARGS} cd ${WRKSRC} && \ ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-build --disable-benchmarks --disable-tests --dependencies-only ${BUILD_ARGS} +. endif # Generates USE_CABAL= ... line ready to be pasted into the port based on artifacts of cabal-extract-deps. make-use-cabal:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105240632.14O6W6q5089718>