git: 949672a6bef2 - main - Uses/cabal.mk: Fix `cabal-extract` target when GH_TUPLE is present.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 31 Jul 2022 15:59:04 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=949672a6bef2134dfe3f2518400b58999d69ac10
commit 949672a6bef2134dfe3f2518400b58999d69ac10
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-07-31 15:56:21 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-07-31 15:58:30 +0000
Uses/cabal.mk: Fix `cabal-extract` target when GH_TUPLE is present.
The presence of dist-newstyle directory created by unpacking Haskell
dependencies from GH_TUPLE makes `cabal` run `git pull` instead of `git clone`.
---
Mk/Uses/cabal.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index d04d6f5ed3fe..929b3d053cf5 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -180,6 +180,7 @@ cabal-extract: check-cabal
@cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD}
. endif
. endif
+ @${RM} -r ${WRKSRC}/dist-newstyle
@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}
# Calls cabal configure on the Haskell package located in ${WRKSRC}