Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Mar 2026 14:34:39 +0000
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: 87a12423c243 - main - Uses/cabal.mk: cd into WRKDIR before calling 'cabal update' during cabal-extract
Message-ID:  <69bd5aff.1a671.6031f0ce@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=87a12423c24377eb05ab20aa44897ecd443c0f9e

commit 87a12423c24377eb05ab20aa44897ecd443c0f9e
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-03-20 14:20:22 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-03-20 14:34:09 +0000

    Uses/cabal.mk: cd into WRKDIR before calling 'cabal update' during cabal-extract
    
    This prevents cabal from picking the Makefile.cabal file
    
    Reported by:    alven
---
 Mk/Uses/cabal.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index e2e6fc8ed1be..c49c819e1276 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -203,7 +203,8 @@ cabal-extract: check-cabal
 	${RM} -r ${CABAL_HOME}
 .  endif
 	@${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal"
-	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
+	cd ${WRKDIR} && \
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
 .  if ${_hackage_is_default} == yes
 	cd ${WRKDIR} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME}


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bd5aff.1a671.6031f0ce>