Date: Sun, 20 Nov 2022 17:39:53 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: b55505da219d - main - Uses/cabal.mk: Do not extract any USE_CABAL distfiles in cabal-extract. Message-ID: <202211201739.2AKHdrKk053817@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=b55505da219d4fe5ded356cfa94486cd4a6d1b80 commit b55505da219d4fe5ded356cfa94486cd4a6d1b80 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-11-11 10:02:05 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2022-11-20 17:39:27 +0000 Uses/cabal.mk: Do not extract any USE_CABAL distfiles in cabal-extract. --- Mk/Uses/cabal.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index ac2ca56fef53..81c487782f87 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -169,7 +169,7 @@ EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} cabal-extract: check-cabal . if ${_hackage_is_default} == no @${ECHO_MSG} "===> Recursing down to make extract" - @${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes + @${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes USE_CABAL= ${RM} -rf ${CABAL_HOME} . endif @${ECHO_MSG} "===> Fetching Cabal package index into ${CABAL_HOME}/.cabal" @@ -183,7 +183,9 @@ cabal-extract: check-cabal @cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD} . endif . endif +# Remove Haskell dependencies that come from GH_TUPLE @${RM} -r ${WRKSRC}/dist-newstyle +# Create a cookie for cabal-post-patch @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} # Calls cabal build --dry-run on the Haskell package located in ${WRKSRC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211201739.2AKHdrKk053817>