Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 May 2021 19:11:43 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: 8d6788c0871e - main - Uses/cabal.mk: Pass same flags to do-build and cabal-extract-deps.
Message-ID:  <202105141911.14EJBhZ2044346@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=8d6788c0871e0f0ee69678265c5f4707d28484fb

commit 8d6788c0871e0f0ee69678265c5f4707d28484fb
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-05-14 19:10:34 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-05-14 19:11:25 +0000

    Uses/cabal.mk: Pass same flags to do-build and cabal-extract-deps.
---
 Mk/Uses/cabal.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index ee632acd1f79..d0bae62f0b76 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -148,9 +148,9 @@ cabal-extract-deps:
 	cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack
 .  endif
 	cd ${WRKSRC} && \
-		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-configure --flags="${CABAL_FLAGS}" ${CONFIGURE_ARGS}
+		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CONFIGURE_ARGS}
 	cd ${WRKSRC} && \
-		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-build --dependencies-only
+		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-build --disable-benchmarks --disable-tests --dependencies-only ${BUILD_ARGS}
 
 # Generates USE_CABAL= ... line ready to be pasted into the port based on artifacts of cabal-extract-deps.
 make-use-cabal:



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