git: 56e3d8878497 - main - Uses/cabal.mk: Use "cabal build --dry-run" in cabal-configure target.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Nov 2022 17:39:50 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=56e3d8878497d9764bc9b69a90b7990dd309ec71
commit 56e3d8878497d9764bc9b69a90b7990dd309ec71
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-11-11 06:59:54 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-11-20 17:39:27 +0000
Uses/cabal.mk: Use "cabal build --dry-run" in cabal-configure target.
In the future Cabal release the "cabal configure" command changes its meaning.
The closest thing to the configure step in Cabal is "build --dry-run".
---
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 b15a4ee4feaa..02464c39acf7 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -186,10 +186,12 @@ cabal-extract: check-cabal
@${RM} -r ${WRKSRC}/dist-newstyle
@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}
-# Calls cabal configure on the Haskell package located in ${WRKSRC}
+# Calls cabal build --dry-run on the Haskell package located in ${WRKSRC}
+# This is a Cabal way of doing configure step of the building process
+# This pulls in all source dependencies, resolves them and generates build plan
cabal-configure: check-cabal
cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS}
+ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
# Calls cabal build on the Haskell package located in ${WRKSRC}
cabal-build: check-cabal