Date: Wed, 27 Jul 2022 14:56:49 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: d5655de18216 - main - Uses/cabal.mk: Do not include '.' package when CABAL_PROJECT=append Message-ID: <202207271456.26REunoW005140@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=d5655de18216ed5bfe20522e3285574eb720f3e5 commit d5655de18216ed5bfe20522e3285574eb720f3e5 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-07-26 15:01:35 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2022-07-27 14:55:50 +0000 Uses/cabal.mk: Do not include '.' package when CABAL_PROJECT=append If we are appending to an exisiting project file all needed package directories are already listed there. --- Mk/Uses/cabal.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 2037696ab369..748bdced162c 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -224,7 +224,10 @@ cabal-post-extract: cabal-post-patch: # Create our own cabal.project - ${ECHO_CMD} "packages: ." > ${WRKSRC}/cabal.project + ${ECHO_CMD} "packages:" > ${WRKSRC}/cabal.project +. if "${CABAL_PROJECT}" != "append" + ${ECHO_CMD} " ." >> ${WRKSRC}/cabal.project +. endif . for package in ${_use_cabal} ${ECHO_CMD} " ${CABAL_DEPS_SUBDIR}/${package:C/_[0-9]+//}" >> ${WRKSRC}/cabal.project . endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207271456.26REunoW005140>