From nobody Sun Nov 20 17:39:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NFd7q17RCz4hjvX; Sun, 20 Nov 2022 17:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NFd7q0XChz4M8B; Sun, 20 Nov 2022 17:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668965991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D1mNxhTUq+mXGEMgftR4eQGTsgaNOYC2UPcLsfBRag=; b=ysQvnbJywPogOmtMaD96/gtzZLTOzBWjCTvBZZp3Dl2mlSq0PCwSAzQ0fzvNuNu6cisXOt a/uuqVGVLQiGczME2NwTbbBJ8uj7qiO4mnIA3POfVKgE8G3j3iW7uLqSGxX2kanAZhCxwI L24XTzY7ekfazqP9rtIQFffcQe3J00yJaWTRQD6BQIcPBWuOdFulmMuNx2Bn2lIVqjmaB6 uvAwAt3BTkO97w2UEbg9FyMRfItoq4lnBWPj339nv70aAkDQMaBboL8fZg/eQUAIy+MK9F stFWNsWuYWRdc6dDkQmfh+W+3UcYzrRmLlKf+tNnwmNoxAaD4ussjTF7LFNGzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668965991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D1mNxhTUq+mXGEMgftR4eQGTsgaNOYC2UPcLsfBRag=; b=bqJKda36n0yxwfuJq2mGXTFIvIA9gAFgTUu2PW72xtrOcvjzkD+lQnlgldtG7DE0WBpClE djgGYpYUzT83x4h1gF2UHFRyGC2qFe1bhk7e5MCtH99KjgfYSI5uRDjonaXyfw8U70UGWC xiLYyBmw+LphD0oV+uzNICVTp6YSvBEi2nYwSjhcxWmkrgQrBHPlAmdzLJ9VrrQzbVTF+Q 5a2JEr5+I1pWk72BUn1hRtTubl82ZmKgcyJdhsHQeJ3hqNsBH6SXBhI/mItX9us/JPiZMU vZbhpFREIgk/QTAgIHHHnP7i+fk03+Ho0xiLm2QjWrjBdp4Xs3OSTmV1en669g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668965991; a=rsa-sha256; cv=none; b=LvNIjkC6wizOeRHfk7cMBqegMA4MenAkanvXssgRd01yBlRWyVBN8tsd0cwH3/MgxRyvzM /rZkY5gTTIK4dOc8V1LWjRl7yCgr84OOsp+O8K2IE2b+PRjr9R/3ifdx95uGysdcA5F9tc z9xg454QO0M/bnRgiaY0+Zffna9ED99U66FAoniwfySX273ebAw5HVad6EvrL/MxD0/XLr 8DDkXKN5qmBCWTFSGVTnnuIBqALcZaxFUgJYd6ZmgO2c1juZcVV25pZRLB9RpaRAjgUXVU yFlSCqNmBNEOnOwQ1hYWWr8i0ChZ3RfY6ZS+zkzVpkzNe33R2Jpn3SSJVuD+GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NFd7p6k8KzXnP; Sun, 20 Nov 2022 17:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AKHdobJ053765; Sun, 20 Nov 2022 17:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKHdoQ2053764; Sun, 20 Nov 2022 17:39:50 GMT (envelope-from git) Date: Sun, 20 Nov 2022 17:39:50 GMT Message-Id: <202211201739.2AKHdoQ2053764@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 56e3d8878497 - main - Uses/cabal.mk: Use "cabal build --dry-run" in cabal-configure target. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56e3d8878497d9764bc9b69a90b7990dd309ec71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=56e3d8878497d9764bc9b69a90b7990dd309ec71 commit 56e3d8878497d9764bc9b69a90b7990dd309ec71 Author: Gleb Popov AuthorDate: 2022-11-11 06:59:54 +0000 Commit: Gleb Popov CommitDate: 2022-11-20 17:39:27 +0000 Uses/cabal.mk: Use "cabal build --dry-run" in cabal-configure target. In the future Cabal release the "cabal configure" command changes its meaning. The closest thing to the configure step in Cabal is "build --dry-run". --- Mk/Uses/cabal.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index b15a4ee4feaa..02464c39acf7 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -186,10 +186,12 @@ cabal-extract: check-cabal @${RM} -r ${WRKSRC}/dist-newstyle @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} -# Calls cabal configure on the Haskell package located in ${WRKSRC} +# Calls cabal build --dry-run on the Haskell package located in ${WRKSRC} +# This is a Cabal way of doing configure step of the building process +# This pulls in all source dependencies, resolves them and generates build plan cabal-configure: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS} + ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Calls cabal build on the Haskell package located in ${WRKSRC} cabal-build: check-cabal