From nobody Sun Nov 20 17:39:53 2022 X-Original-To: dev-commits-ports-all@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 4NFd7s5gwgz4hk3B; Sun, 20 Nov 2022 17:39:53 +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 4NFd7s2R9Nz4MSH; Sun, 20 Nov 2022 17:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668965993; 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=S4O//TUy4B/iAA4/ptFfMxXOtmLL8AqpuOZLW+D0HXE=; b=tzHXHoJnRRDX7umsA/AC1J+8Kb2ZjG6lQ3BSiApOqzPiHqA4WDWqfcgIVIaaPfnUSq4yKT Yn5o5UFz7xfpb75n4DlhaVQ8EgRi0CpEizEYRjTcOH3/ZRrdRuRlMhCqdW6Iw5uWrrhJeJ Xd8hOqWVJS4miEJx21Yzb3od38ATI00p4xEVKsq/6nE+AZY/tp4vUDeDaSCjmuAMxyW+Ba lEAsOlQsSHO6myiDsoLb3dYZXeiAUhwyioZhJAdhAvZXGgpUTqZVc+NKEEpgi1E1Zs6VHf Ra8syXgEsUvmUDZ76Ru7UhhcB8nQNtJlXtMpwTp4AYYgKYV3t32kWKLk/GEnoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668965993; 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=S4O//TUy4B/iAA4/ptFfMxXOtmLL8AqpuOZLW+D0HXE=; b=W7d7K2hAlD+8dxPUD2/aBNvOC5fRg1dtOx5w9zRaKWs01rw5X4BKyQ+9vCGwzDbyTO8l4D 5GE5PiDke/KjaN9h8K21qv2DE8Bjzl7xyNlralcn09XD3kE2iwPE4WxH3IaDDVWRPJd4Pb +cXKMnXJZbaeQ7c9LgMI49Qz7eikC9gtNrfGmeHRXgYd3J1cctjB7b3b9a1xkZTP3nELP4 VeN81HAO6gSpVZ/KrGAbyNi9CV/JesIwl6UvJsyLHtRy1cfnlsFWhehfBDOaNvlMvCeV1Y CGojESb25wLKjB/TVgMFX3Rxwa6nHPKCA3hBH4X+t6x2QJdgcHLmh3Al67BSvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668965993; a=rsa-sha256; cv=none; b=bvg2WQFvVn+wHlfxTPEeh6TNLtFt5V4JyPFJMsOEluF/uoLTunY3uYGxT2QYvqAPMDbFx1 onjBFw0fLEVZtcBDHODJBuw3Qju0AGSPj82vcinTOwjhnSBTftXtIQ/a4wAC5JNL9sxFii zQsGMn2EzqJBFexThQlvw5K9rmgaIU12eeSRBS1jFgBLuHIAs0IzDRhuAFZbfXWSuwAlPp W7Rd2+bVFS+Zzyiu7p0gmN30U40a2SZa6VmndUfg5qKmDfW4gEQ2eEafbpGo/gRn11Ie/U fXwhkQpumOdK6hM5C1W8cMMqP7LoyqQWzeoTNkYd+b0KDA1VYTXXCZ9BNfLtwA== 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 4NFd7s1XmnzXSh; Sun, 20 Nov 2022 17:39:53 +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 2AKHdrSS053818; Sun, 20 Nov 2022 17:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKHdrKk053817; Sun, 20 Nov 2022 17:39:53 GMT (envelope-from git) Date: Sun, 20 Nov 2022 17:39:53 GMT Message-Id: <202211201739.2AKHdrKk053817@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: b55505da219d - main - Uses/cabal.mk: Do not extract any USE_CABAL distfiles in cabal-extract. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b55505da219d4fe5ded356cfa94486cd4a6d1b80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b55505da219d4fe5ded356cfa94486cd4a6d1b80 commit b55505da219d4fe5ded356cfa94486cd4a6d1b80 Author: Gleb Popov AuthorDate: 2022-11-11 10:02:05 +0000 Commit: Gleb Popov CommitDate: 2022-11-20 17:39:27 +0000 Uses/cabal.mk: Do not extract any USE_CABAL distfiles in cabal-extract. --- Mk/Uses/cabal.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index ac2ca56fef53..81c487782f87 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -169,7 +169,7 @@ EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} cabal-extract: check-cabal . if ${_hackage_is_default} == no @${ECHO_MSG} "===> Recursing down to make extract" - @${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes + @${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes USE_CABAL= ${RM} -rf ${CABAL_HOME} . endif @${ECHO_MSG} "===> Fetching Cabal package index into ${CABAL_HOME}/.cabal" @@ -183,7 +183,9 @@ cabal-extract: check-cabal @cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD} . endif . endif +# Remove Haskell dependencies that come from GH_TUPLE @${RM} -r ${WRKSRC}/dist-newstyle +# Create a cookie for cabal-post-patch @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} # Calls cabal build --dry-run on the Haskell package located in ${WRKSRC}