From owner-dev-commits-ports-main@freebsd.org Mon May 24 06:32:07 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CAE8655F5D; Mon, 24 May 2021 06:32:07 +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 4FpS6v0kGGz3Hy9; Mon, 24 May 2021 06:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 016642589E; Mon, 24 May 2021 06:32:07 +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 14O6W6ki089719; Mon, 24 May 2021 06:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14O6W6q5089718; Mon, 24 May 2021 06:32:06 GMT (envelope-from git) Date: Mon, 24 May 2021 06:32:06 GMT Message-Id: <202105240632.14O6W6q5089718@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: 0da1ad3eb5be - main - Uses/cabal.mk: Make cabal-extract-deps target overridable. 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: 0da1ad3eb5beb90ab1b86ff0e478a9ab0f08baca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 06:32:07 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0da1ad3eb5beb90ab1b86ff0e478a9ab0f08baca commit 0da1ad3eb5beb90ab1b86ff0e478a9ab0f08baca Author: Gleb Popov AuthorDate: 2021-05-24 06:29:14 +0000 Commit: Gleb Popov CommitDate: 2021-05-24 06:32:02 +0000 Uses/cabal.mk: Make cabal-extract-deps target overridable. --- 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 bc576b73d091..5154bcca81b3 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -156,14 +156,16 @@ cabal-extract: ${WRKDIR} # Fetches and unpacks dependencies sources for a cabal-extract'ed package. # Builds them as side-effect. +. if !target(cabal-extract-deps) cabal-extract-deps: -. if ${cabal_ARGS:Mhpack} +. if ${cabal_ARGS:Mhpack} cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack -. endif +. endif cd ${WRKSRC} && \ ${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 --disable-benchmarks --disable-tests --dependencies-only ${BUILD_ARGS} +. endif # Generates USE_CABAL= ... line ready to be pasted into the port based on artifacts of cabal-extract-deps. make-use-cabal: