Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 May 2021 06:32:07 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: 9da151fff0e8 - main - devel/hs-haskell-language-server: Override extract-cabal-deps.
Message-ID:  <202105240632.14O6W7qH089739@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=9da151fff0e879aee7872c99246051db786cfc84

commit 9da151fff0e879aee7872c99246051db786cfc84
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-05-24 06:30:31 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-05-24 06:32:03 +0000

    devel/hs-haskell-language-server: Override extract-cabal-deps.
    
    The target provided by USES won't do for this port, because it uses Shake
    to build the code.
---
 devel/hs-haskell-language-server/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile
index 037ddbddfdee..b6b6ca8fb3f8 100644
--- a/devel/hs-haskell-language-server/Makefile
+++ b/devel/hs-haskell-language-server/Makefile
@@ -230,13 +230,8 @@ do-install:
 .endfor
 	${LN} -s ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-8.10.4
 
-make-use-cabal-hls:
-	${RM} ${WRKSRC}/cabal.project
-	${CP} ${WRKSRC}/cabal.project.hls ${WRKSRC}/cabal.project
-	${RM} -rf ${CABAL_HOME}/.cabal
-	${SETENV} HOME=${CABAL_HOME} cabal new-update
+cabal-extract-deps:
 	cd ${WRKSRC} && \
 		${SETENV} HOME=${CABAL_HOME} hls-install hls
-	${MAKE} make-use-cabal
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105240632.14O6W7qH089739>